From 16e203a0d32df9829bcf4fb738ef89fc94404155 Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Mon, 2 Apr 2007 11:40:48 +0000
Subject: Fix for the most disruptive items in QPID-243. * All #include lines
 now use '""' rather than '<>' where appropriate. * #include lines within the
 qpid project use relative includes so that   the same path will work in
 /usr/include when installed as part of the   client libraries. * All the
 source code has now been rearranged to be under src in a directory  
 analogous to the namespace of the classes in it.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@524769 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/gen/Makefile.am        | 37 -------------------------------------
 cpp/gen/make-gen-src-mk.sh | 30 ------------------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 cpp/gen/Makefile.am
 delete mode 100755 cpp/gen/make-gen-src-mk.sh

(limited to 'cpp/gen')

diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am
deleted file mode 100644
index e16923fcc2..0000000000
--- a/cpp/gen/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-include gen-src.mk
-
-BUILT_SOURCES = $(generated_sources) $(generated_headers)
-pkginclude_HEADERS=$(generated_headers)
-
-# Distribute the generated sources, at least for now, since
-# the generator code is in java.
-EXTRA_DIST = $(BUILT_SOURCES)
-DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk
-
-# 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 = $(srcdir)/../gentools
-spec_dir = $(srcdir)/../../specs
-
-# FIXME aconway 2007-01-04: Enabling Basic class until
-# new messaging class is ready to replace it.
-# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml
-spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
-
-gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
-
-$(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
-	rm -f $(generated_sources)
-	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
-	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
-	        -c -o . -t $(gentools_dir)/templ.cpp $(spec)
-	touch timestamp
-
-gen-src.mk: timestamp
-	./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
-	mv $@-t $@
-endif
diff --git a/cpp/gen/make-gen-src-mk.sh b/cpp/gen/make-gen-src-mk.sh
deleted file mode 100755
index 08eb8ea134..0000000000
--- a/cpp/gen/make-gen-src-mk.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Generate the gen-src.mk makefile fragment, to stdout.
-# Usage: <gentools_dir> <gentools_srcdir>
-
-gentools_dir=$1
-gentools_srcdir=$2
-
-wildcard() { echo `ls $* 2>/dev/null` ; }
-
-cat <<EOF
-generated_sources = `wildcard *.cpp`
-
-generated_headers = `wildcard *.h`
-
-if CAN_GENERATE_CODE
-
-java_sources = `wildcard $gentools_srcdir/*.java`
-
-cxx_templates = `wildcard $gentools_dir/templ.cpp/*.tmpl`
-
-# Empty rules in case one of these files is removed,
-# renamed or no longer generated.
-\$(spec):
-\$(java_sources):
-\$(cxx_templates):
-endif
-
-EOF
-
-
-- 
cgit v1.2.1