client lib include must not depend on _common.hxx

diff --git a/codegen/TODO b/codegen/TODO
index bc1720a..e9ba24e 100644 (file)
--- a/codegen/TODO
+++ b/codegen/TODO
@@ -1,5 +1,4 @@
 - configure.in sed s,CODEGEN,XMLPP, oder so
-- one group splitted into multiple .cpp files (=> add support for multiple xml input files)
 - remove support for LIBT2N_EXPORT_GROUP(group) (this will simplify the generator a lot)
-- add option similar to gccs -MD
-- remove export file argument (or multiple export files?)
\ No newline at end of file
+- add option similar to gccs -MD (at the moment it is a fixed set of files generated and
+  they are handled in the makefile)

diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am
index 450f1de..d2e5931 100644 (file)
--- a/example-codegen/Makefile.am
+++ b/example-codegen/Makefile.am
@@ -51,7 +51,8 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 %.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 '#include "codegen-stubhead.hxx"' > $*_common.hxx;
+       echo '#include "$*.hxx"' >> $*_common.hxx;
        echo > $*_server.hxx;
 # todo use tmp file for xml file
        for i in $($*_GROUP); do \

diff --git a/example-codegen/default.cpp b/example-codegen/default.cpp
index f22250d..460b130 100644 (file)
--- a/example-codegen/default.cpp
+++ b/example-codegen/default.cpp
@@ -1,4 +1,3 @@
-#include "default.hxx"
 #include "default_common.hxx"
 
 //! test pass by copy

diff --git a/example-codegen/other-1.cpp b/example-codegen/other-1.cpp
index 054eaed..b0898be 100644 (file)
--- a/example-codegen/other-1.cpp
+++ b/example-codegen/other-1.cpp
@@ -1,4 +1,3 @@
-#include "other.hxx"
 #include "other_common.hxx"
 
 using namespace std;

diff --git a/example-codegen/other-2.cpp b/example-codegen/other-2.cpp
index adba920..51a444a 100644 (file)
--- a/example-codegen/other-2.cpp
+++ b/example-codegen/other-2.cpp
@@ -1,4 +1,3 @@
-#include "other.hxx"
 #include "other_common.hxx"
 
 //! test own type