From 872dc047a9a0f765543ff5eb5ab1fc529cc74992 Mon Sep 17 00:00:00 2001 From: Jens Thiele Date: Wed, 14 Feb 2007 13:15:19 +0000 Subject: [PATCH] automake >= 1.5? does not allow to use += if the variable is not defined yet => use = in this examples: find -name codegen.make|xargs sed -i 's, += , = ,' --- examples-codegen/example1/codegen.make | 8 ++++---- examples-codegen/example2/codegen.make | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples-codegen/example1/codegen.make b/examples-codegen/example1/codegen.make index d7c991b..5c84e31 100644 --- 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))) @@ -28,7 +28,7 @@ libt2ngroup_%.P : Makefile.am 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 +48,7 @@ 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) # didn't work (same problem as with _LTLIBRARIES [parsing by automake], # this time _OBJECTS was not correct) @@ -61,4 +61,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 diff --git a/examples-codegen/example2/codegen.make b/examples-codegen/example2/codegen.make index d7c991b..5c84e31 100644 --- a/examples-codegen/example2/codegen.make +++ b/examples-codegen/example2/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))) @@ -28,7 +28,7 @@ libt2ngroup_%.P : Makefile.am 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 +48,7 @@ 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) # didn't work (same problem as with _LTLIBRARIES [parsing by automake], # this time _OBJECTS was not correct) @@ -61,4 +61,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 -- 1.7.1