diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-10 22:36:12 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-10 22:36:12 +0000 |
| commit | 842a09455d5d243ca71088ec999e319d761df8fb (patch) | |
| tree | 99a69a6514064c120a7d6b2b355e55254f76d628 /cpp/rpm | |
| parent | 35cbdf5f3cd0dbcd2e8a0a81741db1082daec3a2 (diff) | |
| download | qpid-python-842a09455d5d243ca71088ec999e319d761df8fb.tar.gz | |
* docs/api/*: Fixed API doc generation to work with VPATH builds.
* src/Makefile.am:
- Added missing .h files in distribution.
* src & tests Makefile.am:
- Made generated .mk fragments maintaner-clean, not distclean, otherwise
distclean followed by a VPATH build fails.
* cpp/src/tests/quick_topictest: cat error log on failure.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527325 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/rpm')
| -rw-r--r-- | cpp/rpm/Makefile.am | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am index 363a444f4f..ddcbea868c 100644 --- a/cpp/rpm/Makefile.am +++ b/cpp/rpm/Makefile.am @@ -2,26 +2,25 @@ # Build RPMs from the distribution tarball. # -# TODO aconway 2006-12-21: use autoconf macros for version, base name etc. - SPEC=${top_srcdir}/qpidc.spec RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir}" +DIRS="BUILD RPMS SOURCES SPECS SRPMS" clean-local: - -rm -rf BUILD RPMS SOURCES SPECS SRPMS + -rm -rf $(DIRS) -.PHONY: rpm srpm dist +.PHONY: rpm srpm # Build source and binary RPMs. -rpm: dist +rpm: $(DIRS) rpmbuild $(RPMOPTS) $(RPMEXTRAOPTS) -ba $(SPEC) rpmlint RPMS/*/*.rpm # Build source RPM only. -srpm: dist +srpm: $(DIRS) rpmbuild $(RPMOPTS) -bs $(SPEC) -# Build source distribution and create required subdirs. -dist: - cd .. && $(MAKE) $(AM_MAKEFLAGS) dist - mkdir -p BUILD RPMS SOURCES SPECS SRPMS +$(DIRS): + mkdir -p $(DIRS) + + |