# HG changeset patch
# User laurent
# Date 1276717937 -7200
# Node ID 79946638460471846f52cd445f7aa4bf6a798e34
# Parent  3a478229db8b3ecc53356fe40f24020c160dcf87# Parent  bdfee1f5be9ed52ec5d09e6d5a8b68c87608764c
merge

diff -r 3a478229db8b -r 799466384604 Makefile
--- a/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -66,7 +66,7 @@
 
 Makefile.depend depend:
 	$(CXX) -MM -MG -I. *.cc \
-	  | perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
 include Makefile.depend
 
diff -r 3a478229db8b -r 799466384604 Makefile.CYGWIN_NT-5.1
--- a/Makefile.CYGWIN_NT-5.1	Wed Jun 02 18:21:15 2010 +0200
+++ b/Makefile.CYGWIN_NT-5.1	Wed Jun 16 21:52:17 2010 +0200
@@ -4,7 +4,7 @@
 #get warnings, debugging information and optimization
 CFLAGS  = -Wall -Wpointer-arith -Wwrite-strings
 # CFLAGS += -Werror
-CFLAGS += -ggdb
+# CFLAGS += -ggdb
 #CFLAGS += -O3 -funroll-loops
 # Note: if the optimizer crashes, we'll leave out the -O3 for those files
 
diff -r 3a478229db8b -r 799466384604 absyntax/Makefile
--- a/absyntax/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/absyntax/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -27,3 +27,8 @@
 ../% /% absyntax/% stage1_2/% stage3/% stage4/% util/%:
 	        $(MAKE) -C $(@D) $(@F)
 
+Makefile.depend depend:
+	$(CXX) -MM -MG -I. *.cc \
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
+
+include Makefile.depend
diff -r 3a478229db8b -r 799466384604 absyntax_utils/Makefile
--- a/absyntax_utils/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/absyntax_utils/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -39,7 +39,7 @@
 
 
 Makefile.depend depend:
-	$(CXX) -MM -MG -I. *.cc > Makefile.depend
-	#| perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	$(CXX) -MM -MG -I. *.cc \
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
 include Makefile.depend
diff -r 3a478229db8b -r 799466384604 stage1_2/Makefile
--- a/stage1_2/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/stage1_2/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -46,8 +46,9 @@
 
 
 Makefile.depend depend:
-	$(CXX) -MM -MG -I. *.cc > Makefile.depend
-	#| perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	$(CXX) -MM -MG -I. *.cc \
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
 include Makefile.depend
 
+
diff -r 3a478229db8b -r 799466384604 stage3/Makefile
--- a/stage3/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/stage3/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -22,7 +22,7 @@
 
 
 Makefile.depend depend:
-	$(CXX) -MM -MG -I. *.cc > Makefile.depend
-	#| perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	$(CXX) -MM -MG -I. *.cc \
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
-include Makefile.depend
\ No newline at end of file
+include Makefile.depend
diff -r 3a478229db8b -r 799466384604 stage4/Makefile
--- a/stage4/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/stage4/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -19,3 +19,8 @@
 ../% /% absyntax/% stage1_2/% stage3/% stage4/% util/%:
 	        $(MAKE) -C $(@D) $(@F)
 
+Makefile.depend depend:
+	$(CXX) -MM -MG -I. *.cc \
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
+
+include Makefile.depend
diff -r 3a478229db8b -r 799466384604 stage4/generate_c/Makefile
--- a/stage4/generate_c/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/stage4/generate_c/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -23,10 +23,6 @@
 
 Makefile.depend depend:
 	$(CXX) -MM -MG -I. *.cc \
-	  | perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
 include Makefile.depend
-
-
-
-
diff -r 3a478229db8b -r 799466384604 stage4/generate_iec/Makefile
--- a/stage4/generate_iec/Makefile	Wed Jun 02 18:21:15 2010 +0200
+++ b/stage4/generate_iec/Makefile	Wed Jun 16 21:52:17 2010 +0200
@@ -23,10 +23,8 @@
 ../% /%:
 	$(MAKE) -C $(@D) $(@F)
 
-
 Makefile.depend depend:
 	$(CXX) -MM -MG -I. *.cc \
-	  | perl -pe 's/:/ Makefile.depend:/' > Makefile.depend
+	  | sed 's/:/ Makefile.depend:/' > Makefile.depend
 
 include Makefile.depend
-