X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=example-codegen%2FMakefile.am;h=00aaac711efdd24e7dc081d7b2fae79967a19e5b;hp=a4195d4f104a2f668cd308849470c11df84c083f;hb=d0a97d0bbe03472214e379b7a4ace2bdcecfc212;hpb=2c2d29e114d44d1a2d4fb5f1c2b49b60b80b304a

diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am
index a4195d4..00aaac7 100644
--- a/example-codegen/Makefile.am
+++ b/example-codegen/Makefile.am
@@ -1,6 +1,6 @@
 # not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.4
+# you have all needed files, that a GNU package needs
+AUTOMAKE_OPTIONS = foreign
 
 INCLUDES = @LIBT2N_CFLAGS@
 LDADD = @LIBT2N_LIBS@
@@ -19,11 +19,16 @@ 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
+# we would like to use nodist_ here but our automake is to old
+# nodist_libdefault_la_SOURCES = default_client.cpp
+# nodist_libother_la_SOURCES = other_client.cpp
+
+# using objects as workaround
+libdefault_la_OBJECTS += default_client.lo
+#libdefault_la_SOURCES = default_client.cpp
+libother_la_OBJECTS += other_client.lo
+#libother_la_SOURCES = other_client.cpp
 lib_LTLIBRARIES = libdefault.la libother.la
 
 # build an example server and client
@@ -32,9 +37,15 @@ client_LDADD = $(LDADD) libdefault.la libother.la
 
 noinst_PROGRAMS = client server
 
+# we would like to use nodist_ here but our automake is to old
+# nodist_server_SOURCES = other_server.cpp default_server.cpp
+
+server_LDADD = $(LDADD) other_server.$(OBJEXT) default_server.$(OBJEXT)
+
 server_SOURCES = \
-	server.cpp $(other_GROUP) $(default_GROUP) \
-	other_server.cpp default_server.cpp
+	server.cpp $(other_GROUP) $(default_GROUP)
+#	other_server.cpp default_server.cpp
+
 
 # test script
 
@@ -42,13 +53,10 @@ TESTS = test
 
 EXTRA_DIST = $(TESTS) configure.in
 
-# we have got an old automake version (1.4-p5) which doesn't support nodist_
-# => you might want to use the dist-hook to remove generated files
-dist-hook:
-	rm -vf $(foreach i, $(LIBT2N_CODEGEN_BUILT), $(distdir)/$(i))
-
 # if you use libt2n-codegen you should add this
-@LIBT2N_CODEGEN_MAKESNIPPET@
-
-CLEANFILES = $(LIBT2N_SUGGESTED_CLEANFILES)
-
+# (i did not find a nice way to let libt2n install this makefile snippet
+# and let projects using libt2n use the installed version.
+# the core of the problem is:
+# the makefile snippet is already needed when automake is run
+# => no way to let configure locate the snippet)
+include codegen.make