X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fcodegen.make;h=747ed319d521f5946fc6a251555b8280168a45de;hp=99ffd3d2ee69680c658f792a52b0aa485a433498;hb=630ececc28458d4442e8a128f215f2450f46bf95;hpb=e62269cbcab8ba959ff5a110e309be27f7600dbe

diff --git a/codegen/codegen.make b/codegen/codegen.make
index 99ffd3d..747ed31 100644
--- a/codegen/codegen.make
+++ b/codegen/codegen.make
@@ -10,12 +10,9 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 
 -include $(foreach i, $(CMDGROUPS), libt2ngroup_$(i).P)
 
-libt2ngroup_%.P : Makefile.am
+libt2ngroup_%.P : Makefile
 	echo $@ : $($*_GROUP) > libt2ngroup_$*.P
 
-LIBT2N_CODEGEN ?= $(top_builddir)/codegen/libt2n-codegen
-LIBT2N_CLIENT_PC_IN ?= $(top_srcdir)/codegen/clientlib.pc.in
-
 %.libt2nstamp : libt2ngroup_%.P $(LIBT2N_CODEGEN)
 # assuming we have some unix like shell (maybe even bash)
 	echo BUILT_SOURCES: $(BUILT_SOURCES)
@@ -28,17 +25,18 @@ LIBT2N_CLIENT_PC_IN ?= $(top_srcdir)/codegen/clientlib.pc.in
 	done; \
 	$(LIBT2N_CODEGEN) $* $($*_GROUP:.cpp=.xml) && touch $@
 
-BUILT_SOURCES = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )
+LIBT2N_CODEGEN_BUILT = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )
+BUILT_SOURCES += $(LIBT2N_CODEGEN_BUILT)
 
-STAMPS=$(CMDGROUPS:=.libt2nstamp)
-$(BUILT_SOURCES) : $(STAMPS)
+LIBT2N_STAMPS=$(CMDGROUPS:=.libt2nstamp)
+$(BUILT_SOURCES) : $(LIBT2N_STAMPS)
 
-# Install the pkg-config files:
+# Install the pkg-config files: (todo: perhaps use +=)
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(CMDGROUPS:=.pc)
 
 # .pc files (one pc file for each command group)
-%.pc : $(LIBT2N_CLIENT_PC_IN) Makefile
+%.pc : $(LIBT2N_CLIENT_PCTEMPLATE) Makefile
 	sed \
 	-e 's,@CMDGROUP@,$*,g' \
 	-e 's,\@prefix\@,$(prefix),g' \
@@ -47,7 +45,10 @@ pkgconfig_DATA = $(CMDGROUPS:=.pc)
 	-e 's,\@includedir\@,$(includedir),g' \
 	$< >$*.pc
 
-CLEANFILES = $(BUILT_SOURCES) $(STAMPS) $(pkgconfig_DATA)
+LIBT2N_SUGGESTED_CLEANFILES = $(LIBT2N_CODEGEN_BUILT) $(LIBT2N_STAMPS) $(pkgconfig_DATA)
+
+# doesn't work
+# CLEANFILES = $(LIBT2N_SUGGESTED_CLEANFILES)
 
 # didn't work (same problem as with _LTLIBRARIES [parsing by automake],
 # this time _OBJECTS was not correct)
@@ -57,5 +58,6 @@ CLEANFILES = $(BUILT_SOURCES) $(STAMPS) $(pkgconfig_DATA)
 
 # we have got an old automake version (1.4-p5) which doesn't support nodist_
 # => we use the dist-hook
-dist-hook:
-	rm -vf $(foreach i, $(BUILT_SOURCES), $(distdir)/$(i))
+# unfortunately dist-hook only works if directly visible for automake (=> not in this include)
+#dist-hook:
+#	rm -vf $(foreach i, $(BUILT_SOURCES), $(distdir)/$(i))