* cpp/src/Makefile.am: Move generated code into src. Fix generation script.

* cpp/src/generate.sh: New generator script, simplify & fix some problems.
* cpp/Makefile.am: removed gen subdir
* cpp/bootstrap: remove redundant comment
* cpp/configure.ac: remove generator tests, now in generate.sh
* cpp/gen,cpp/gen/Makefile.am,cpp/gen/gen-src-mk.sh: Replaced by generate.sh
* cpp/src/tests/Makefile.am: Remove client_test from EXTRA_DEPS


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537278 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 0 insertions, 82 deletions

diff --git a/qpid/cpp/gen/Makefile.am b/qpid/cpp/gen/Makefile.am
deleted file mode 100644
index c1f27c8700..0000000000
--- a/qpid/cpp/gen/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Generate code from AMQP XML specification.
-#
--include gen-src.mk
-
-# Distribute the generated sources, since the code generator depends
-# on tools that may not be available in the build environment.
-GEN_SRC=$(generated_cpp) $(generated_h) 
-BUILT_SOURCES =  $(GEN_SRC) gen-src.mk
-EXTRA_DIST = $(BUILT_SOURCES)
-
-# Install generated headers
-nobase_include_HEADERS = $(generated_h)
-
-# Don't attempt to run the code generator unless configure has set
-# CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
-# to run the code generator are available.
-#
-if CAN_GENERATE_CODE
-gentools_dir = $(top_srcdir)/gentools
-gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
-spec_dir = $(top_srcdir)/../specs
-spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
-
-$(GEN_SRC): $(spec) $(java_sources) $(cxx_templates) 
-	mkdir -p qpid/framing
-	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
-	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
-	        -c -o qpid/framing -t $(gentools_dir)/templ.cpp $(spec)
-	touch qpid/timestamp
-
-gen-src.mk: $(BUILT_SOURCES) gen-src-mk.sh
-	$(srcdir)/gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
-	mv $@-t $@
-
-else
-# No code generator, we must be in a distribution tree.
-# Copy gen-src.mk from the source dir as make does not look for
-# include files in the VPATH
-gen-src.mk: $(srcdir)/gen-src.mk
-	cp $< $@
-DISTCLEANFILES=gen-src.mk
-endif
-
-maintainer-clean-local:
-	rm -rf qpid gen-src.mk $(gentools_srcdir)/*.class
diff --git a/qpid/cpp/gen/gen-src-mk.sh b/qpid/cpp/gen/gen-src-mk.sh
deleted file mode 100755
index c17bc14307..0000000000
--- a/qpid/cpp/gen/gen-src-mk.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Generates gen-src.mk makefile fragment, to stdout.
-# Usage: <gentools_dir> <gentools_srcdir>
-
-gentools_dir=$1
-gentools_srcdir=$2
-
-backslashify() {
-    for x in $* ; do
-	echo " \\"
-	echo -n "  $x"
-    done
-    echo ; echo
-}
-    
-
-echo -n "generated_cpp = "
-backslashify `find * -name '*.cpp' -print`
-echo -n  "generated_h = "
-backslashify `find * -name '*.h' -print`
-
-echo
-echo -n "java_sources ="
-backslashify `find $gentools_srcdir -name '*.java' -print`
-echo -n "cxx_templates ="
-backslashify `find $gentools_dir/templ.cpp -name '*.tmpl'`
-
-cat <<EOF
-# Empty rules in case one of these files is removed,
-# renamed or no longer generated.
-\$(spec):
-\$(java_sources):
-\$(cxx_templates):
-EOF
-
-