diff options
| author | Alan Conway <aconway@apache.org> | 2007-12-04 22:33:34 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-12-04 22:33:34 +0000 |
| commit | 2748b0d5c5d6cb7efe718eae53bdd9adbae1fc36 (patch) | |
| tree | 72b907f6c9cb14216752a505f28e86a76bad02e9 /qpid/cpp/examples | |
| parent | a5d215809f5b5425715189b5c929c496046d1ae4 (diff) | |
| download | qpid-python-2748b0d5c5d6cb7efe718eae53bdd9adbae1fc36.tar.gz | |
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@601125 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/examples')
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 14 |
1 files changed, 6 insertions, 8 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 |