[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - build-sys: make jaql/sql compile again after ...
From:       Fabian Groffen <fabian () cwi ! nl>
Date:       2012-03-30 11:11:34
Message-ID: hg.cf53705c9f52.1333105894.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: cf53705c9f52 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf53705c9f52
Modified Files:
	buildtools/conf/rules.mk
Branch: default
Log Message:

build-sys: make jaql/sql compile again after windows fixes

This just cleans up, like the Windows fixes did also.  We no longer need
to prepend monetdb_config.h to the generated bison and flex sources.


diffs (43 lines):

diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -22,17 +22,10 @@ MV=mv
 HIDE=1
 MX = $(top_builddir)/buildtools/Mx/Mx
 
-# in the next few rules, make sure that "$(CONFIG_H)" is included
-# first, also with bison-generated files.  This is crucial
-# to prevent inconsistent (re-)definitions of macros.
 %.tab.c: %.y
 	touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do sleep 1; done && rm waiting.$$$$
 	$(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
 	if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
-	$(MV) $*.tab.c $*.tab.c.tmp
-	echo '#include <'"$(CONFIG_H)"'>' > $*.tab.c
-	grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.tab.c.tmp >> $*.tab.c
-	$(RM) $*.tab.c.tmp
 	[ ! -f y.tab.h ] || $(RM) y.tab.h
 	$(RM) waiting
 
@@ -46,19 +39,13 @@ MX = $(top_builddir)/buildtools/Mx/Mx
 %.yy.c: %.l
 	touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do sleep 1; done && rm waiting.$$$$
 	$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
-	if [ -f $(LEX_OUTPUT_ROOT).c ]; then $(MV) $(LEX_OUTPUT_ROOT).c $*.yy.c ; fi
-	$(MV) $*.yy.c $*.yy.c.tmp
-	echo '#include <'"$(CONFIG_H)"'>' > $*.yy.c
-	grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.yy.c.tmp >> $*.yy.c
-	$(RM) $*.yy.c.tmp
-	[ -f $(LEX_OUTPUT_ROOT).h ] && $(RM) $(LEX_OUTPUT_ROOT).h
+	[ -f $*.yy.h ] && $(RM) $*.yy.h
 	$(RM) waiting
 
 %.yy.h: %.l
 	touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do sleep 1; done && rm waiting.$$$$
 	$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
-	if [ -f $(LEX_OUTPUT_ROOT).h ]; then $(MV) $(LEX_OUTPUT_ROOT).h $*.yy.h ; fi
-	[ -f $(LEX_OUTPUT_ROOT).c ] && $(RM) $(LEX_OUTPUT_ROOT).c
+	[ -f $*.yy.c ] && $(RM) $*.yy.c
 	$(RM) waiting
 
 %.def: %.syms
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]