qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r601125 - in /incubator/qpid/trunk/qpid/cpp: examples/Makefile.am qpidc.spec.in rubygen/generate src/Makefile.am
Date Tue, 04 Dec 2007 22:33:35 GMT
Author: aconway
Date: Tue Dec  4 14:33:34 2007
New Revision: 601125

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

examples/Makefile.am:
 - installcheck target builds installed examples.
 - Automatically run by rpmbuild and distcheck targets.
rubygen/generate: fixed packaging error in rubygen.mk
src/Makefile.am: fixed packaging error.

Modified:
    incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
    incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
    incubator/qpid/trunk/qpid/cpp/rubygen/generate
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=601125&r1=601124&r2=601125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/examples/Makefile.am Tue Dec  4 14:33:34 2007
@@ -24,15 +24,13 @@
 
 # Note: we don't use normal automake SUBDIRS because the example
 # makefiles don't understand all the recursive automake targets.
-#
-src=../../$(top_srcdir)/src
-bld=../../$(top_builddir)/src
-EXAMPLE_FLAGS=-I$(src) -I$(src)/gen -I$(bld)/gen -L$(bld)/.libs
-
-all:
-	cd examples; $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
 
 clean:
 	cd examples; $(MAKE) clean
 
-
+# Build the installed examples, then clean up to avoid rpmbuild warnings.
+EXAMPLE_FLAGS=-I$(DESTDIR)$(includedir) -L$(DESTDIR)$(libdir) -Wl,-rpath,$(DESTDIR)$(libdir)
+EXAMPLE_DIR=$(DESTDIR)$(pkgdatadir)/examples 
+installcheck-local:
+	cd $(EXAMPLE_DIR) && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(EXAMPLE_FLAGS)" all
+	cd $(EXAMPLE_DIR) && $(MAKE) clean

Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?rev=601125&r1=601124&r2=601125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Tue Dec  4 14:33:34 2007
@@ -152,6 +152,9 @@
 
 %changelog
 
+* Thu Nov 8 2007 Alan Conway <aconway@redhat.com> - 0.2-12
+- installcheck target to build examples in installation.
+
 * Thu Nov 8 2007 Alan Conway <aconway@redhat.com> - 0.2-10
 - added examples to RPM package.
 

Modified: incubator/qpid/trunk/qpid/cpp/rubygen/generate
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/generate?rev=601125&r1=601124&r2=601125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/generate (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/generate Tue Dec  4 14:33:34 2007
@@ -57,10 +57,10 @@
 
 # Header file install rules.
 EOS
-    ["framing", "client", "broker"].each { |ns|
+    ["framing", "client/no_keyword","client", "broker"].each { |ns|
       dir="qpid/#{ns}"
       dir_ = dir.tr("/", "_")
-      regex=%r|#{dir}/.+\.h$|
+      regex=%r|#{dir}/[^/]+\.h$|
       out << <<EOS
 #{dir_}dir = $(includedir)/#{dir}
 dist_#{dir_}_HEADERS = #{make_continue rgen_srcs.grep(regex)}

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=601125&r1=601124&r2=601125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Dec  4 14:33:34 2007
@@ -119,7 +119,7 @@
   qpid/framing/InitiationHandler.cpp \
   qpid/framing/ProtocolInitiation.cpp \
   qpid/framing/ProtocolVersion.cpp \
-  qpid/framing/SessionState.cpp qpid/framing/SessionState.h \
+  qpid/framing/SessionState.cpp \
   qpid/framing/SendContent.cpp \
   qpid/framing/SequenceNumber.cpp \
   qpid/framing/SequenceNumberSet.cpp \
@@ -376,6 +376,7 @@
   qpid/framing/ProtocolInitiation.h \
   qpid/framing/ProtocolVersion.h \
   qpid/framing/Proxy.h \
+  qpid/framing/SessionState.h \
   qpid/framing/SendContent.h \
   qpid/framing/SequenceNumber.h \
   qpid/framing/SequenceNumberSet.h \



Mime
View raw message