X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=example-codegen%2Fcodegen.make;h=f9de2b73d603ff1bb5109f5bff21698a7ca71968;hp=add7355511a35f5e2e9ca30cd56be437c4e30c68;hb=d0a97d0bbe03472214e379b7a4ace2bdcecfc212;hpb=d37ba346490f74d11dbd2e676d6968b2cb46af8c

diff --git a/example-codegen/codegen.make b/example-codegen/codegen.make
index add7355..f9de2b7 100644
--- a/example-codegen/codegen.make
+++ b/example-codegen/codegen.make
@@ -14,9 +14,9 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 libt2ngroup_%.P : Makefile.am
 	echo $@ : $($*_GROUP) > libt2ngroup_$*.P
 
-%.libt2nstamp : libt2ngroup_%.P $(LIBT2N_CODEGEN)
+%.libt2nstamp : libt2ngroup_%.P
 # assuming we have some unix like shell (maybe even bash)
-	echo BUILT_SOURCES: $(BUILT_SOURCES)
+#	echo BUILT_SOURCES: $(BUILT_SOURCES)
 # temporarily create _common.hxx file (will be overwritten by codegen below)
 	echo '#include "codegen-stubhead.hxx"' > $*_common.hxx;
 	echo '#include "$*.hxx"' >> $*_common.hxx;
@@ -27,6 +27,8 @@ libt2ngroup_%.P : Makefile.am
 	$(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)) )
+
+# using BUILT_SOURCES is a bit problematic (see also automake manual)
 BUILT_SOURCES += $(LIBT2N_CODEGEN_BUILT)
 
 LIBT2N_STAMPS=$(CMDGROUPS:=.libt2nstamp)
@@ -39,11 +41,12 @@ pkgconfig_DATA = $(CMDGROUPS:=.pc)
 # .pc files (one pc file for each command group)
 %.pc : $(LIBT2N_CLIENT_PCTEMPLATE) Makefile
 	sed \
-	-e 's,@CMDGROUP@,$*,g' \
+	-e 's,\@CMDGROUP\@,$*,g' \
 	-e 's,\@prefix\@,$(prefix),g' \
 	-e 's,\@exec_prefix\@,$(exec_prefix),g' \
 	-e 's,\@libdir\@,$(libdir),g' \
 	-e 's,\@includedir\@,$(includedir),g' \
+	-e 's,\@VERSION\@,$(VERSION),g' \
 	$< >$*.pc
 
 CLEANFILES += $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
@@ -55,8 +58,8 @@ CLEANFILES += $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
 #	$(foreach i, $(CMDGROUPS), $(i)_server.cpp)
 
 # we have got an old automake version (1.4-p5) which doesn't support nodist_
-# => we use the dist-hook
-dist-hook:
+# => we use this hack using the dist-hook
+dist-hook: $(LIBT2N_CODEGEN_BUILT)
 	rm -vf $(foreach i, $(LIBT2N_CODEGEN_BUILT), $(distdir)/$(i))
 
 EXTRA_DIST += codegen.make