make distcheck fixes

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index ca4aa36..f156c98 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -6,3 +6,7 @@ codegen_SOURCES = main.cpp
 bin_PROGRAMS = codegen
 
 EXTRA_DIST = clientlib.pc.in
+
+# todo: do we really want to install it
+# (maybe it would be better to install a copy with each client lib?)
+include_HEADERS = codegen-stubhead.hxx

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 09edab3..c5c4615 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,5 +8,5 @@ endif
 
 all: $(MANUALS)
 
-html/index.html: ../src/*.cpp ../src/*.hxx
+html/index.html: $(top_srcdir)/src/*.cpp $(top_srcdir)/src/*.hxx
        $(DOXYGEN)

diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am
index 3cc4d3d..816fafd 100644 (file)
--- a/example-codegen/Makefile.am
+++ b/example-codegen/Makefile.am
@@ -34,8 +34,7 @@ noinst_PROGRAMS = client server
 
 TESTS = test
 
-
-
+EXTRA_DIST = $(TESTS)
 
 # always the same:
 
@@ -43,12 +42,12 @@ 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)
+-include $(foreach i, $(CMDGROUPS), group_$(i).P)
 
-.deps/group_%.P : Makefile.am
-       echo $@ : $($*_GROUP) > .deps/group_$*.P
+group_%.P : Makefile.am
+       echo $@ : $($*_GROUP) > group_$*.P
 
-%.stamp : .deps/group_%.P $(top_builddir)/codegen/codegen
+%.stamp : group_%.P $(top_builddir)/codegen/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)
@@ -56,7 +55,7 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
        echo '#include "$*.hxx"' >> $*_common.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; \
+               gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
        done; \
        $(top_builddir)/codegen/codegen $* $($*_GROUP:.cpp=.xml) && touch $@
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0b24d4b..aac0621 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,17 +2,25 @@ INCLUDES = -I$(top_srcdir)/src @BOOST_CPPFLAGS@ @CPPUNIT_CFLAGS@
 
 LDADD = $(top_builddir)/src/libt2n.la @BOOST_SERIALIZATION_LIB@ @BOOST_LDFLAGS@
 
-libminimalistic_client_la_SOURCES = minimalistic-client-stub.cpp
+libminimalistic_client_la_SOURCES = \
+       minimalistic-stub.hxx \
+       minimalistic-stub-once.hxx \
+       minimalistic-client-stub.hxx \
+       minimalistic-client-stub.cpp
+
 noinst_LTLIBRARIES = libminimalistic-client.la
 
 minimalistic_client_SOURCES = minimalistic-client.cpp
 minimalistic_client_LDADD = $(LDADD) libminimalistic-client.la
 
-minimalistic_server_SOURCES = minimalistic-server.cpp minimalistic-server-stub.cpp
+minimalistic_server_SOURCES = \
+       minimalistic-server.cpp \
+       minimalistic-server-stub.cpp
 
 noinst_PROGRAMS = minimalistic_client minimalistic_server
 
 all-local: minimalistic-server.xml
 
 minimalistic-server.xml: minimalistic-server.cpp
-       gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) minimalistic-server.cpp -fxml=minimalistic-server.xml
+       gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/minimalistic-server.cpp -fxml=minimalistic-server.xml
+

diff --git a/examples/minimalistic-client-stub.cpp b/examples/minimalistic-client-stub.cpp
index d6ec553..338667d 100644 (file)
--- a/examples/minimalistic-client-stub.cpp
+++ b/examples/minimalistic-client-stub.cpp
@@ -22,4 +22,4 @@ std::string cmd_group_example_client::testfunc(const std::string& str)
 // include in this compilation unit to ensure the compilation unit is used
 // see also:
 // http://www.google.de/search?q=g%2B%2B+static+initializer+in+static+library
-#include "minimalistic-stub.cpp"
+#include "minimalistic-stub-once.hxx"

diff --git a/examples/minimalistic-server-stub.cpp b/examples/minimalistic-server-stub.cpp
index 996fe40..8b094ef 100644 (file)
--- a/examples/minimalistic-server-stub.cpp
+++ b/examples/minimalistic-server-stub.cpp
@@ -7,4 +7,5 @@ libt2n::result* testfunc_cmd::operator()()
   return new testfunc_res(testfunc(param));
 }
 
-#include "minimalistic-stub.cpp"
+#include "minimalistic-stub-once.hxx"
+

diff --git a/examples/minimalistic-stub.cpp b/examples/minimalistic-stub-once.hxx
similarity index 100%
rename from examples/minimalistic-stub.cpp
rename to examples/minimalistic-stub-once.hxx