X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fcodegen.make;h=d097350f1d0016889a454e822ac0f173700498b9;hp=a7ebf762a39bbaefa4ef2c2bd375ab829370fa61;hb=5a7380a04aa973dbd47d8f1dfba68a73b95ed67b;hpb=84b484fa66baa81473a4278153b43221f877a2e1

diff --git a/codegen/codegen.make b/codegen/codegen.make
index a7ebf76..d097350 100644
--- a/codegen/codegen.make
+++ b/codegen/codegen.make
@@ -1,4 +1,4 @@
-# Makefile snippet included by projects using codegen
+# Makefile snippet included by projects using libt2n-codegen
 
 # Asumptions: 
 # gnu make (functions for transforming text)
@@ -8,12 +8,12 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 
 #IFILES=$(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j)))
 
--include $(foreach i, $(CMDGROUPS), group_$(i).P)
+-include $(foreach i, $(CMDGROUPS), libt2ngroup_$(i).P)
 
-group_%.P : Makefile.am
-	echo $@ : $($*_GROUP) > group_$*.P
+libt2ngroup_%.P : Makefile.am
+	echo $@ : $($*_GROUP) > libt2ngroup_$*.P
 
-%.stamp : group_%.P $(top_builddir)/codegen/codegen
+%.libt2nstamp : libt2ngroup_%.P $(LIBT2N_CODEGEN)
 # assuming we have some unix like shell (maybe even bash)
 	echo BUILT_SOURCES: $(BUILT_SOURCES)
 # temporarily create _common.hxx file (will be overwritten by codegen below)
@@ -23,11 +23,12 @@ group_%.P : Makefile.am
 	for i in $($*_GROUP); do \
 		gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
 	done; \
-	$(top_builddir)/codegen/codegen $* $($*_GROUP:.cpp=.xml) && touch $@
+	$(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:=.stamp)
+STAMPS=$(CMDGROUPS:=.libt2nstamp)
 $(BUILT_SOURCES) : $(STAMPS)
 
 # Install the pkg-config files:
@@ -35,7 +36,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(CMDGROUPS:=.pc)
 
 # .pc files (one pc file for each command group)
-%.pc : $(top_srcdir)/codegen/clientlib.pc.in Makefile
+%.pc : $(LIBT2N_CLIENT_PCTEMPLATE) Makefile
 	sed \
 	-e 's,@CMDGROUP@,$*,g' \
 	-e 's,\@prefix\@,$(prefix),g' \
@@ -54,5 +55,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))