From 5a7380a04aa973dbd47d8f1dfba68a73b95ed67b Mon Sep 17 00:00:00 2001
From: Jens Thiele <jens.thiele@intra2net.com>
Date: Mon, 4 Dec 2006 13:46:55 +0000
Subject: [PATCH] unfortunately dist-hook only works if directly visible for automake

---
 codegen/codegen.make        |    8 +++++---
 example-codegen/Makefile.am |   13 +++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/codegen/codegen.make b/codegen/codegen.make
index 450597f..d097350 100644
--- a/codegen/codegen.make
+++ b/codegen/codegen.make
@@ -25,7 +25,8 @@ libt2ngroup_%.P : Makefile.am
 	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)
@@ -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))
diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am
index 1911f20..cabf100 100644
--- a/example-codegen/Makefile.am
+++ b/example-codegen/Makefile.am
@@ -1,6 +1,3 @@
-# if you use codegen you should add the next line
-@LIBT2N_CODEGEN_MAKESNIPPET@
-
 INCLUDES = @LIBT2N_CPPFLAGS@
 LDADD = @LIBT2N_LIBS@
 
@@ -39,4 +36,12 @@ server_SOURCES = \
 
 TESTS = test
 
-EXTRA_DIST = $(TESTS)
+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, $(BUILT_SOURCES), $(distdir)/$(i))
+
+# if you use codegen you should add the next line at the end
+@LIBT2N_CODEGEN_MAKESNIPPET@
-- 
1.7.1