diff options
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 14 | ||||
| -rw-r--r-- | qpid/cpp/qpidc.spec.in | 3 | ||||
| -rwxr-xr-x | qpid/cpp/rubygen/generate | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 3 |
4 files changed, 13 insertions, 11 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index 5915e0a282..21b799d17e 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/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/qpid/cpp/qpidc.spec.in b/qpid/cpp/qpidc.spec.in index 41e51f2c31..13ff819c6e 100644 --- a/qpid/cpp/qpidc.spec.in +++ b/qpid/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/qpid/cpp/rubygen/generate b/qpid/cpp/rubygen/generate index dba39dbf80..94b194aaa4 100755 --- a/qpid/cpp/rubygen/generate +++ b/qpid/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/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 02ebd10c50..e87c2de35b 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/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 \ |