svn commit: r525297 - in /incubator/qpid/trunk/qpid/cpp: bootstrap configure.ac src/Makefile.am src/broker/Makefile.am src/client/Makefile.am src/gen/Makefile.am src/gen/make-gen-src-mk.sh src/make-gen-src-mk.sh

[ac...@apache.org]

Author: aconway
Date: Tue Apr  3 14:56:22 2007
New Revision: 525297

URL: http://svn.apache.org/viewvc?view=rev&rev=525297
Log:

* Remove redundant Makefile.am, not needed with single src/ makefile.
* Fixed automake warnings.

Added:
    incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh
      - copied, changed from r525252, incubator/qpid/trunk/qpid/cpp/src/gen/make-gen-src-mk.sh
Removed:
    incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/gen/make-gen-src-mk.sh
Modified:
    incubator/qpid/trunk/qpid/cpp/bootstrap
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/bootstrap?view=diff&rev=525297&r1=525296&r2=525297
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/bootstrap (original)
+++ incubator/qpid/trunk/qpid/cpp/bootstrap Tue Apr  3 14:56:22 2007
@@ -17,9 +17,9 @@
   # contents of the sole automake-else clause (the warning), then
   # use the result to run the rules that create gen-src.mk, a file
   # that must be created before we run automake.
-  (cd src/gen && rm -f gen-src.mk
+  (cd src && rm -f gen/gen-src.mk
     perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \
-	| make -f - srcdir=. gen-src.mk > /dev/null )
+	| make -f - srcdir=. gen/gen-src.mk > /dev/null )
 fi
 
 # Generate (for automake) lots of repetitive parts of tests/Makefile.am.

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=525297&r1=525296&r2=525297
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Tue Apr  3 14:56:22 2007
@@ -138,9 +138,6 @@
 
 AC_CONFIG_FILES([
   Makefile
-  src/gen/Makefile
-  src/client/Makefile
-  src/broker/Makefile
   src/Makefile
   src/tests/Makefile
   docs/man/Makefile

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=525297&r1=525296&r2=525297
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Apr  3 14:56:22 2007
@@ -1,7 +1,6 @@
 include gen/gen-src.mk
 
-# This is gmake specific
-genBUILT_SOURCES = $(addprefix $(gen)/, $(generated_sources) $(generated_headers))
+BUILT_SOURCES = $(generated_sources) $(generated_headers)
 
 SUBDIRS = . tests
 
@@ -272,12 +271,12 @@
   sys/ProducerConsumer.h
 
 # This is gmake specific
-nobase_pkginclude_HEADERS += $(addprefix $(gen)/, $(generated_headers))
+nobase_pkginclude_HEADERS += $(generated_headers)
 
 # Distribute the generated sources, at least for now, since
 # the generator code is in java.
-EXTRA_DIST += $(genBUILT_SOURCES)
-DISTCLEANFILES = $(genBUILT_SOURCES) $(gen)/timestamp $(gen)/gen-src.mk
+EXTRA_DIST += $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES) $(gen)/timestamp $(gen)/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
@@ -296,15 +295,15 @@
 gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
 
 $(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
-	rm -f $(genBUILT_SOURCES)
+	rm -f $(BUILT_SOURCES)
 	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
 	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
 	        -c -o $(gen) -t $(gentools_dir)/templ.cpp $(spec)
 	touch $(gen)/timestamp
 
 $(gen)/gen-src.mk: $(gen)/timestamp
-	cd $(gen)
-	$(gen)/make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
+	mkdir -p $(gen)
+	./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
 	mv $@-t $@
 endif
 

Copied: incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh (from r525252, incubator/qpid/trunk/qpid/cpp/src/gen/make-gen-src-mk.sh)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh?view=diff&rev=525297&p1=incubator/qpid/trunk/qpid/cpp/src/gen/make-gen-src-mk.sh&r1=525252&p2=incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh&r2=525297
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/gen/make-gen-src-mk.sh (original)
+++ incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh Tue Apr  3 14:56:22 2007
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Generate the gen-src.mk makefile fragment, to stdout.
+# Generates  the gen-src.mk makefile fragment, to stdout.
 # Usage: <gentools_dir> <gentools_srcdir>
 
 gentools_dir=$1
@@ -8,9 +8,9 @@
 wildcard() { echo `ls $* 2>/dev/null` ; }
 
 cat <<EOF
-generated_sources = `wildcard *.cpp`
+generated_sources = `wildcard gen/*.cpp`
 
-generated_headers = `wildcard *.h`
+generated_headers = `wildcard gen/*.h`
 
 if CAN_GENERATE_CODE