svn commit: r660616 - in /incubator/qpid/trunk/qpid/cpp: rubygen/generate src/ src/Makefile.am

[ac...@apache.org]

Author: aconway
Date: Tue May 27 10:20:37 2008
New Revision: 660616

URL: http://svn.apache.org/viewvc?rev=660616&view=rev
Log:
Generate code in $builddir to allow multiple VPATH builds.

Modified:
    incubator/qpid/trunk/qpid/cpp/rubygen/generate
    incubator/qpid/trunk/qpid/cpp/src/   (props changed)
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/rubygen/generate
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/generate?rev=660616&r1=660615&r2=660616&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/generate (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/generate Tue May 27 10:20:37 2008
@@ -71,7 +71,7 @@
   rgen_srcs=GenFiles.get.map{ |f| "#{$outdir}/#{f}" }
   rgen_subdirs={}
   rgen_srcs.each { |src|
-    if src.match(%r{./gen/qpid/([^/]+)/})
+    if src.match(%r{#{$outdir}/qpid/([^/]+)/})
       subdir=$1
       rgen_subdirs[subdir] ||= []
       rgen_subdirs[subdir] << src
@@ -102,15 +102,6 @@
 
 EOS
     }
-    out << <<EOS
-if GENERATE
-$(srcdir)/#{File.basename makefile}: $(rgen_generator) $(specs)
-	$(rgen_cmd)
-
-# Empty rule in case a generator file is renamed/removed.
-$(rgen_generator):
-endif  
-EOS
   }
 end
 

Propchange: incubator/qpid/trunk/qpid/cpp/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 27 10:20:37 2008
@@ -16,3 +16,5 @@
 .Tpo
 generate_MaxMethodBodySize_h
 managementgen.mk
+mgen.timestamp
+rgen.timestamp

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=660616&r1=660615&r2=660616&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue May 27 10:20:37 2008
@@ -19,16 +19,26 @@
 
 # Ruby generator.
 rgen_dir=$(top_srcdir)/rubygen
-rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate $(srcdir)/gen $(specs) all $(srcdir)/rubygen.mk
+rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate gen $(specs) all $(srcdir)/rubygen.mk
+
+$(rgen_srcs) $(srcdir)/rubygen.mk: rgen.timestamp
+rgen.timestamp: $(rgen_generator) $(specs)
+	$(rgen_cmd); touch $@
+$(rgen_generator):
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
 mgen_cmd=$(mgen_dir)/main.py -m $(srcdir)/managementgen.mk \
 	$(top_srcdir)/../specs/management-schema.xml \
 	$(top_srcdir)/../specs/management-types.xml \
-	$(mgen_dir)/templates $(srcdir)/gen/qpid/management
+	$(mgen_dir)/templates gen/qpid/management
+
+$(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
+mgen.timestamp: $(mgen_generator)
+	$(mgen_cmd); touch $@
+$(mgen_generator):
 
-endif				# GENERATE
+endif # GENERATE
 
 include $(srcdir)/rubygen.mk
 include $(srcdir)/managementgen.mk