From 84b484fa66baa81473a4278153b43221f877a2e1 Mon Sep 17 00:00:00 2001 From: Jens Thiele Date: Tue, 28 Nov 2006 15:55:17 +0000 Subject: [PATCH] do not ship generated files (dist-hook hack). added codegen.make --- codegen/Makefile.am | 2 +- codegen/TODO | 6 ++++ codegen/codegen.make | 58 ++++++++++++++++++++++++++++++++++++++++ example-codegen/Makefile.am | 61 +++++-------------------------------------- example-codegen/TODO | 2 + 5 files changed, 74 insertions(+), 55 deletions(-) create mode 100644 codegen/codegen.make diff --git a/codegen/Makefile.am b/codegen/Makefile.am index f156c98..5fab309 100644 --- a/codegen/Makefile.am +++ b/codegen/Makefile.am @@ -5,7 +5,7 @@ codegen_SOURCES = main.cpp bin_PROGRAMS = codegen -EXTRA_DIST = clientlib.pc.in +EXTRA_DIST = clientlib.pc.in codegen.make # todo: do we really want to install it # (maybe it would be better to install a copy with each client lib?) diff --git a/codegen/TODO b/codegen/TODO index e9ba24e..41e2160 100644 --- a/codegen/TODO +++ b/codegen/TODO @@ -2,3 +2,9 @@ - remove support for LIBT2N_EXPORT_GROUP(group) (this will simplify the generator a lot) - add option similar to gccs -MD (at the moment it is a fixed set of files generated and they are handled in the makefile) + +open questions: +- should projects using the codegen depend on installed version of ... or ship their own version? + * codegen binary + * Makefile snippet + * codegen-stubhead.hxx diff --git a/codegen/codegen.make b/codegen/codegen.make new file mode 100644 index 0000000..a7ebf76 --- /dev/null +++ b/codegen/codegen.make @@ -0,0 +1,58 @@ +# Makefile snippet included by projects using codegen + +# Asumptions: +# gnu make (functions for transforming text) +# sed is available + +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) + +group_%.P : Makefile.am + echo $@ : $($*_GROUP) > group_$*.P + +%.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) + echo '#include "codegen-stubhead.hxx"' > $*_common.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) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \ + done; \ + $(top_builddir)/codegen/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) +$(BUILT_SOURCES) : $(STAMPS) + +# Install the pkg-config files: +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = $(CMDGROUPS:=.pc) + +# .pc files (one pc file for each command group) +%.pc : $(top_srcdir)/codegen/clientlib.pc.in Makefile + sed \ + -e 's,@CMDGROUP@,$*,g' \ + -e 's,\@prefix\@,$(prefix),g' \ + -e 's,\@exec_prefix\@,$(exec_prefix),g' \ + -e 's,\@libdir\@,$(libdir),g' \ + -e 's,\@includedir\@,$(includedir),g' \ + $< >$*.pc + +CLEANFILES = $(BUILT_SOURCES) $(STAMPS) $(pkgconfig_DATA) + +# didn't work (same problem as with _LTLIBRARIES [parsing by automake], +# this time _OBJECTS was not correct) +# server_SOURCES = server.cpp \ +# $(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j))) \ +# $(foreach i, $(CMDGROUPS), $(i)_server.cpp) + +# 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)) diff --git a/example-codegen/Makefile.am b/example-codegen/Makefile.am index 816fafd..d1134fe 100644 --- a/example-codegen/Makefile.am +++ b/example-codegen/Makefile.am @@ -15,6 +15,8 @@ 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 @@ -24,65 +26,16 @@ lib_LTLIBRARIES = libdefault.la libother.la client_SOURCES = client.cpp client_LDADD = $(LDADD) libdefault.la libother.la -server_SOURCES = server.cpp \ - $(other_GROUP) other_server.cpp \ - $(default_GROUP) default_server.cpp - noinst_PROGRAMS = client server +server_SOURCES = \ + server.cpp $(other_GROUP) $(default_GROUP) \ + other_server.cpp default_server.cpp + # test script TESTS = test EXTRA_DIST = $(TESTS) -# always the same: - -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) - -group_%.P : Makefile.am - echo $@ : $($*_GROUP) > group_$*.P - -%.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) - echo '#include "codegen-stubhead.hxx"' > $*_common.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) $(srcdir)/$${i} -fxml=$${i%*.cpp}.xml; \ - done; \ - $(top_builddir)/codegen/codegen $* $($*_GROUP:.cpp=.xml) && touch $@ - -# assuming we have gnu make? -BUILT_SOURCES = $(foreach i, $(CMDGROUPS), $(foreach j, _common.hxx _common.cpp _client.hxx _client.cpp _server.hxx _server.cpp, $(i)$(j)) ) - -STAMPS=$(CMDGROUPS:=.stamp) -$(BUILT_SOURCES) : $(STAMPS) - -# Install the pkg-config files: -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(CMDGROUPS:=.pc) - -# .pc files (one pc file for each command group) -%.pc : $(top_srcdir)/codegen/clientlib.pc.in Makefile - sed \ - -e 's,@CMDGROUP@,$*,g' \ - -e 's,\@prefix\@,$(prefix),g' \ - -e 's,\@exec_prefix\@,$(exec_prefix),g' \ - -e 's,\@libdir\@,$(libdir),g' \ - -e 's,\@includedir\@,$(includedir),g' \ - $< >$*.pc - -CLEANFILES = $(BUILT_SOURCES) $(STAMPS) $(pkgconfig_DATA) - -# didn't work (same problem as with _LTLIBRARIES [parsing by automake], -# this time _OBJECTS was not correct) -# server_SOURCES = server.cpp \ -# $(foreach i, $(CMDGROUPS), $(foreach j, $($(i)_GROUP), $(j))) \ -# $(foreach i, $(CMDGROUPS), $(i)_server.cpp) +include $(top_srcdir)/codegen/codegen.make diff --git a/example-codegen/TODO b/example-codegen/TODO index 40a8731..6afaf9b 100644 --- a/example-codegen/TODO +++ b/example-codegen/TODO @@ -18,3 +18,5 @@ now we use the first solution for codegen - but not overwriting output files if they are the same) - howto include the part after "# always the same:" in all makefiles using the codegenerator - lib name should be group name + suffix/prefix +- at the moment make dist from within a clean source will not work + (this is related to the nodist problem) -- 1.7.1