rename codegen binary to libt2n-codegen, prepare makefile snippet for installation...

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index e1120dd..b5689df 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -1,9 +1,9 @@
 INCLUDES = @XMLPP_CFLAGS@
 LDADD = @XMLPP_LIBS@
 
-codegen_SOURCES = main.cpp
+libt2n_codegen_SOURCES = main.cpp
 
-bin_PROGRAMS = codegen
+bin_PROGRAMS = libt2n-codegen
 
 EXTRA_DIST = clientlib.pc.in codegen.make
 

diff --git a/codegen/TODO b/codegen/TODO
index ac99f43..dd9baca 100644 (file)
--- a/codegen/TODO
+++ b/codegen/TODO
@@ -4,6 +4,12 @@
 
 open questions:
 - should projects using the codegen depend on installed version of ... or ship their own version?
-       * codegen binary
-       * Makefile snippet
+       * codegen binary: no
+       * Makefile snippet: no
        * codegen-stubhead.hxx
+- get rid of codegen-stubhead.hxx or include a "copy" in each project
+- makefile snippet must work for builds outside of libt2n
+  (=> some variables must be set by configure, the snippet must be installed
+   => pc file template must be installed, too)
+
+

diff --git a/codegen/codegen.make b/codegen/codegen.make
index a7ebf76..99ffd3d 100644 (file)
--- a/codegen/codegen.make
+++ b/codegen/codegen.make
@@ -1,4 +1,4 @@
-# Makefile snippet included by projects using codegen
+# Makefile snippet included by projects using libt2n-codegen
 
 # Asumptions: 
 # gnu make (functions for transforming text)
@@ -8,12 +8,15 @@ include_HEADERS += $(foreach i, $(CMDGROUPS), $(i)_client.hxx $(i).hxx)
 
 #IFILES=$(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j)))
 
--include $(foreach i, $(CMDGROUPS), group_$(i).P)
+-include $(foreach i, $(CMDGROUPS), libt2ngroup_$(i).P)
 
-group_%.P : Makefile.am
-       echo $@ : $($*_GROUP) > group_$*.P
+libt2ngroup_%.P : Makefile.am
+       echo $@ : $($*_GROUP) > libt2ngroup_$*.P
 
-%.stamp : group_%.P $(top_builddir)/codegen/codegen
+LIBT2N_CODEGEN ?= $(top_builddir)/codegen/libt2n-codegen
+LIBT2N_CLIENT_PC_IN ?= $(top_srcdir)/codegen/clientlib.pc.in
+
+%.libt2nstamp : libt2ngroup_%.P $(LIBT2N_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)
@@ -23,11 +26,11 @@ group_%.P : Makefile.am
        for i in $($*_GROUP); do \
                gccxml $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \
        done; \
-       $(top_builddir)/codegen/codegen $* $($*_GROUP:.cpp=.xml) && touch $@
+       $(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)) )
 
-STAMPS=$(CMDGROUPS:=.stamp)
+STAMPS=$(CMDGROUPS:=.libt2nstamp)
 $(BUILT_SOURCES) : $(STAMPS)
 
 # Install the pkg-config files:
@@ -35,7 +38,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(CMDGROUPS:=.pc)
 
 # .pc files (one pc file for each command group)
-%.pc : $(top_srcdir)/codegen/clientlib.pc.in Makefile
+%.pc : $(LIBT2N_CLIENT_PC_IN) Makefile
        sed \
        -e 's,@CMDGROUP@,$*,g' \
        -e 's,\@prefix\@,$(prefix),g' \