X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=example-codegen%2FMakefile.am;h=d1134fe149480c7c4d9dd624096320681957c2d9;hp=14cd67d31710b0984c9b39a9f25ac64b39018ed3;hb=84b484fa66baa81473a4278153b43221f877a2e1;hpb=6e27f586ddced58bf12fec79cf5d8bf467400c66

diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am
index 14cd67d..d1134fe 100644
--- a/example-codegen/Makefile.am
+++ b/example-codegen/Makefile.am
@@ -9,11 +9,14 @@ default_GROUP = default.cpp
 # example of a command group using multiple cpp files
 other_GROUP = other-1.cpp other-2.cpp
 
-# foo.hxx must be listed manually
+# headers declaring data types used as rpc arguments must be listed manually
+# (in this example the class Foo)
 include_HEADERS = foo.hxx
 
 # unfortunately we can't set those from variables
 # because they are parsed by automake
+# and we can't use noinst since our automake version is to old
+# (see dist-hook in codegen.make)
 
 libdefault_la_SOURCES = default_client.cpp
 libother_la_SOURCES = other_client.cpp
@@ -23,57 +26,16 @@ lib_LTLIBRARIES = libdefault.la libother.la
 client_SOURCES = client.cpp
 client_LDADD = $(LDADD) libdefault.la libother.la
 
-server_SOURCES = server.cpp \
-	$(other_GROUP) other_server.cpp \
-	$(default_GROUP) default_server.cpp \
-	foo.hxx
-
 noinst_PROGRAMS = client server
 
+server_SOURCES = \
+	server.cpp $(other_GROUP) $(default_GROUP) \
+	other_server.cpp default_server.cpp
+
 # test script
 
 TESTS = test
 
-# always the same:
-
-include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
-
-#IFILES=$(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j)))
-
--include $(foreach i, $(CMDGROUPS), .deps/group_$(i).P)
-
-.deps/group_%.P : Makefile.am
-	echo $@ : $($*_GROUP) > .deps/group_$*.P
-
-%.stamp : .deps/group_%.P $(top_builddir)/codegen/codegen
-# assuming we have some unix like shell (maybe even bash)
-	echo BUILT_SOURCES: $(BUILT_SOURCES)
-	cp -v $(top_srcdir)/codegen/codegen-stubhead.hxx $*_common.hxx;
-	echo > $*_server.hxx;
-# todo use tmp file for xml file
-	for i in $($*_GROUP); do \
-		gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $${i} -fxml=$${i%*.cpp}.xml; \
-	done; \
-	$(top_builddir)/codegen/codegen $* $($*_GROUP:.cpp=.xml) && touch $@
-
-# assuming we have gnu make?
-BUILT_SOURCES = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) )
-
-STAMPS=$(CMDGROUPS:=.stamp)
-$(BUILT_SOURCES) : $(STAMPS)
-
-# Install the pkg-config files:
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(CMDGROUPS:=.pc)
-
-# .pc files (one pc file for each command group)
-%.pc : $(top_srcdir)/codegen/clientlib.pc.in Makefile
-	sed \
-	-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' \
-	$< >$*.pc
+EXTRA_DIST = $(TESTS)
 
-CLEANFILES = $(BUILT_SOURCES) $(STAMPS) $(pkgconfig_DATA)
+include $(top_srcdir)/codegen/codegen.make