From: Jens Thiele <jens.thiele@intra2net.com>
Date: Wed, 14 Feb 2007 13:33:35 +0000 (+0000)
Subject: newer automake versions define a seperate additional variable DEFAULT_INCLUDES =... 
X-Git-Tag: v0.3~6
X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=commitdiff_plain;h=0c0df506c58182d36d1adb76e5b053e6486dd2c2;hp=177f7aebeed4567e999f4796914588143ba35da9

newer automake versions define a seperate additional variable DEFAULT_INCLUDES => added: find -name codegen.make|xargs sed -i 's,, ,'
---

diff --git a/examples-codegen/example1/codegen.make b/examples-codegen/example1/codegen.make
index 5c84e31..b6bbe1b 100644
--- a/examples-codegen/example1/codegen.make
+++ b/examples-codegen/example1/codegen.make
@@ -22,7 +22,7 @@ libt2ngroup_%.P : Makefile.am
 	echo '#include "$*.hxx"' >> $*_common.hxx;
 # todo use tmp file for xml file
 	for i in $($*_GROUP); do \
-		gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
+		gccxml $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
 	done && $(LIBT2N_CODEGEN) $* $($*_GROUP:.cpp=.xml) && touch $@
 
 LIBT2N_CODEGEN_BUILT = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )
diff --git a/examples-codegen/example2/codegen.make b/examples-codegen/example2/codegen.make
index 5c84e31..b6bbe1b 100644
--- a/examples-codegen/example2/codegen.make
+++ b/examples-codegen/example2/codegen.make
@@ -22,7 +22,7 @@ libt2ngroup_%.P : Makefile.am
 	echo '#include "$*.hxx"' >> $*_common.hxx;
 # todo use tmp file for xml file
 	for i in $($*_GROUP); do \
-		gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
+		gccxml $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
 	done && $(LIBT2N_CODEGEN) $* $($*_GROUP:.cpp=.xml) && touch $@
 
 LIBT2N_CODEGEN_BUILT = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )