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 | d83cbdc60dc6c76b0b6de0a11a603f5517f6e65b (patch) | |
| tree | 744d1bb8b74bc79895a3b16c9e784932690cda32 /cpp/examples | |
| parent | 48ba374fde6ee32b601f75f285a303b5f6b73594 (diff) | |
| download | qpid-python-d83cbdc60dc6c76b0b6de0a11a603f5517f6e65b.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/qpid@601125 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/examples')
| -rw-r--r-- | cpp/examples/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
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 |