From fb9ad93a3d422c1e83c998f44c4782f7bf1d1a66 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 1 Dec 2006 05:11:45 +0000 Subject: 2006-12-01 Jim Meyering This delta imposes two major changes on the C++ hierarchy: - adds autoconf, automake, libtool support - makes the hierarchy flatter and renames a few files (e.g., Queue.h, Queue.cpp) that appeared twice, once under client/ and again under broker/. In the process, I've changed many #include directives, mostly to remove a qpid/ or qpid/framing/ prefix from the file name argument. Although most changes were to .cpp and .h files under qpid/cpp/, there were also several to template files under qpid/gentools, and even one to CppGenerator.java. Nearly all files are moved to a new position in the hierarchy. The new hierarchy looks like this: src # this is the new home of qpidd.cpp tests # all tests are here. See Makefile.am. gen # As before, all generated files go here. lib # This is just a container for the 3 lib dirs: lib/client lib/broker lib/common lib/common/framing lib/common/sys lib/common/sys/posix lib/common/sys/apr build-aux m4 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@481159 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/gen/Makefile.am | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 cpp/gen/Makefile.am (limited to 'cpp/gen/Makefile.am') diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am new file mode 100644 index 0000000000..1f38a419d6 --- /dev/null +++ b/cpp/gen/Makefile.am @@ -0,0 +1,38 @@ +# TODO aconway 2006-11-30: nasty hack, should be done by automake? +abs_srcdir = @abs_srcdir@ + +include gen-src.mk + +BUILT_SOURCES = $(generated_sources) + +# Distribute the generated sources, at least for now, since +# the generator code is in java. +EXTRA_DIST = $(BUILT_SOURCES) +MAINTAINERCLEANFILES = $(BUILT_SOURCES) + +gentools_dir = $(abs_srcdir)/../../gentools +spec_dir = $(abs_srcdir)/../../specs +spec = $(spec_dir)/amqp-8.0.xml + +# FIXME: add dependencies? +timestamp: $(spec) + if test -d $(gentools_dir); then \ + rm -f $(generated_sources); \ + (cd $(gentools_dir)/src/org/apache/qpid/gentools && \ + rm -f *.class && javac *.java); \ + java -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \ + -c -o . -t $(gentools_dir)/templ.cpp $(spec); \ + else \ + echo "warning: failed to regenerate gen/*.{cpp,h}" 1>&2; \ + fi + touch timestamp + +EXTRA_DIST += timestamp +$(generated_sources): timestamp + +EXTRA_DIST += gen-src.mk +gen-src.mk: timestamp + ( echo 'generated_sources = \' \ + && ls *.cpp *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \ + ) > $@-t + mv $@-t $@ -- cgit v1.2.1