workaround incompatibilies of newer automake (+=) by adding AC_SUBST to configure...

[libt2n] / examples-codegen / example1 / codegen.make

diff --git a/examples-codegen/example1/codegen.make b/examples-codegen/example1/codegen.make
index 5c84e31..71179b4 100644 (file)
--- a/examples-codegen/example1/codegen.make
+++ b/examples-codegen/example1/codegen.make
@@ -4,7 +4,7 @@
 # gnu make (functions for transforming text)
 # sed is available
 
-include_HEADERS = $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
+include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 
 # not needed but nice to have
 # IFILES=$(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j)))
@@ -22,13 +22,15 @@ 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; \
-       done && $(LIBT2N_CODEGEN) $* $($*_GROUP:.cpp=.xml) && touch $@
+               gccxml $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
+       done && $(LIBT2N_CODEGEN) $* $($*_GROUP:.cpp=.xml) && for i in $($*_GROUP); do \
+               rm $${i%*.cpp}.xml; \
+       done && touch $@
 
 LIBT2N_CODEGEN_BUILT = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )
 
 # using BUILT_SOURCES is a bit problematic (see also automake manual)
-BUILT_SOURCES = $(LIBT2N_CODEGEN_BUILT)
+BUILT_SOURCES += $(LIBT2N_CODEGEN_BUILT)
 
 LIBT2N_STAMPS=$(CMDGROUPS:=.libt2nstamp)
 $(BUILT_SOURCES) : $(LIBT2N_STAMPS)
@@ -48,7 +50,8 @@ pkgconfig_DATA = $(CMDGROUPS:=.pc)
        -e 's,\@VERSION\@,$(VERSION),g' \
        $< >$*.pc
 
-CLEANFILES = $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
+CLEANFILES += $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
+DISTCLEANFILES += $(foreach i, $(CMDGROUPS), libt2ngroup_$(i).P)
 
 # didn't work (same problem as with _LTLIBRARIES [parsing by automake],
 # this time _OBJECTS was not correct)
@@ -61,4 +64,4 @@ CLEANFILES = $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
 dist-hook: $(LIBT2N_CODEGEN_BUILT)
        rm -vf $(foreach i, $(LIBT2N_CODEGEN_BUILT), $(distdir)/$(i))
 
-EXTRA_DIST = codegen.make
+EXTRA_DIST += codegen.make