From d83cbdc60dc6c76b0b6de0a11a603f5517f6e65b Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 4 Dec 2007 22:33:34 +0000
Subject: 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.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@601125 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/examples/Makefile.am | 14 ++++++--------
 cpp/qpidc.spec.in        |  3 +++
 cpp/rubygen/generate     |  4 ++--
 cpp/src/Makefile.am      |  3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'cpp')

diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index 5915e0a282..21b799d17e 100644
--- a/cpp/examples/Makefile.am
+++ b/cpp/examples/Makefile.am
@@ -24,15 +24,13 @@ EXTRA_DIST=$(nobase_pkgdata_DATA)
 
 # 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
diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in
index 41e51f2c31..13ff819c6e 100644
--- a/cpp/qpidc.spec.in
+++ b/cpp/qpidc.spec.in
@@ -152,6 +152,9 @@ fi
 
 %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.
 
diff --git a/cpp/rubygen/generate b/cpp/rubygen/generate
index dba39dbf80..94b194aaa4 100755
--- a/cpp/rubygen/generate
+++ b/cpp/rubygen/generate
@@ -57,10 +57,10 @@ rgen_srcs=#{make_continue rgen_srcs}
 
 # 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)}
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 02ebd10c50..e87c2de35b 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -119,7 +119,7 @@ libqpidcommon_la_SOURCES = \
   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 @@ nobase_include_HEADERS = \
   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 \
-- 
cgit v1.2.1