# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1310219311 -3600
# Node ID 27a56785e9cddbc995bef5495f77c974e798f7ef
# Parent  06b561479e4661d81fee2a33ffe4d9864c50b694
changing 'make' to '$(MAKE)' so other make tools (e.g. gmake) may also be used.

diff -r 06b561479e46 -r 27a56785e9cd Makefile
--- a/Makefile	Sat Jul 09 14:17:52 2011 +0100
+++ b/Makefile	Sat Jul 09 14:48:31 2011 +0100
@@ -42,7 +42,7 @@
 	-rm -f iec2iec iec2c *.o absyntax/*.o
 	echo > Makefile.depend
 # make something everywhere (ie, in all Makefiles that have that target)
-	find . -depth -mindepth 2 -maxdepth 2 -name Makefile | sed 's/Makefile//g' | xargs -I {} make -C{} clean
+	find . -depth -mindepth 2 -maxdepth 2 -name Makefile | sed 's/Makefile//g' | xargs -I {} $(MAKE) -C{} clean
 
 CXXFLAGS += -I.
 
diff -r 06b561479e46 -r 27a56785e9cd lib/ieclib.txt
--- a/lib/ieclib.txt	Sat Jul 09 14:17:52 2011 +0100
+++ b/lib/ieclib.txt	Sat Jul 09 14:48:31 2011 +0100
@@ -24,6 +24,11 @@
 (* This is the library conatining the standard function blocks defined in the standard. *)
 
 (* FINAL DRAFT - IEC 61131-3, 2nd Ed. (2001-12-10) *)
+
+(* The standard functions *)
+{#include "standard_functions.txt" }
+
+(* The standard function blocks *)
 {#include "edge_detection.txt" }
 {#include "bistable.txt" }
 {#include "counter.txt" }
@@ -34,6 +39,6 @@
 {#include "pid_st.txt" }
 {#include "ramp_st.txt" }
 
-(* Frome later versions of the standard *)
+(* From later versions of the standard *)
 {#include "sema.txt" }
 
diff -r 06b561479e46 -r 27a56785e9cd stage4/Makefile
--- a/stage4/Makefile	Sat Jul 09 14:17:52 2011 +0100
+++ b/stage4/Makefile	Sat Jul 09 14:48:31 2011 +0100
@@ -28,7 +28,7 @@
 
 clean:
 	rm -f *.o
-	find . -depth -mindepth 2 -maxdepth 2 -name Makefile | sed 's/Makefile//g' | xargs -I {} make -C{} clean
+	find . -depth -mindepth 2 -maxdepth 2 -name Makefile | sed 's/Makefile//g' | xargs -I {} $(MAKE) -C{} clean
 
 
 CXXFLAGS += -I. -I../*