--- a/stage1_2/Makefile	Wed Jul 11 09:53:27 2007 +0200
+++ b/stage1_2/Makefile	Thu Jul 12 11:24:32 2007 +0200
@@ -1,5 +1,5 @@
 # include the system specific Makefile
-#include ../../../Makefile.$(shell uname)
+include ../Makefile.$(shell uname)
 
 
 
@@ -15,12 +15,6 @@
 	-rm -f iec.flex.c iec.y.cc iec.y.hh iec.y.output
 	-rm -f test_flex
 
-#get warnings, debugging information and optimization
-CFLAGS  = -Wall -pedantic -Wpointer-arith -Wwrite-strings
-# CFLAGS += -Werror
-
-CFLAGS += -ggdb -O3 -funroll-loops
-# Note: if the optimizer crashes, we'll leave out the -O3 for those files
 
 CFLAGS += -I. -I../* -I../../absyntax
 
@@ -33,13 +27,13 @@
 	flex -oiec.flex.c iec.flex
 
 iec.flex.o: iec.y.hh iec.flex.c
-	$(CXX) -c iec.flex.c -D LIBDIRECTORY='"$(IECLIBDIR)"' $(CFLAGS)
+	$(CXX) -c iec.flex.c -D DEFAULT_LIBDIR='"$(IECLIBDIR)"' $(CFLAGS)
 
 iec.y.hh iec.y.cc: iec.y
 	bison -d -v -o iec.y.cc iec.y
 
 iec.y.o: iec.y.cc iec.y.hh
-	$(CXX) -c iec.y.cc -D LIBDIRECTORY='"$(IECLIBDIR)"' $(CFLAGS)
+	$(CXX) -c iec.y.cc $(CFLAGS)