From d76a43d243a10cd3de996edd9436ac9104039287 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 9 Mar 2007 16:51:47 +0000 Subject: Merged revisions 492636 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid ........ r492636 | aconway | 2007-01-04 11:55:03 -0500 (Thu, 04 Jan 2007) | 3 lines Added "make check" to -build flag. Removed rpm build directories from svn. Create them during make. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@516459 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/rpm/Makefile.am | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'cpp') diff --git a/cpp/rpm/Makefile.am b/cpp/rpm/Makefile.am index 887b3112c6..3149e26591 100644 --- a/cpp/rpm/Makefile.am +++ b/cpp/rpm/Makefile.am @@ -10,22 +10,17 @@ RPMOPTS=--define "_sourcedir ${abs_top_srcdir}" --define "_topdir ${abs_builddir clean: rm -rf BUILD RPMS SOURCES SPECS SRPMS -.PHONY: rpm srpm dist dirs +.PHONY: rpm srpm dist # Build source and binary RPMs. -rpm: dist dirs +rpm: dist rpmbuild $(RPMOPTS) -ba $(SPEC) # Source RPM only. -srpm: dist dirs +srpm: dist rpmbuild $(RPMOPTS) -bs $(SPEC) -# Build source distribution. +# Build source distribution and create required subdirs. dist: cd .. && $(MAKE) $(AM_MAKEFLAGS) dist - -# Create build directories. -dirs: BUILD RPMS SOURCES SPECS SRPMS -BUILD RPMS SOURCES SPECS SRPMS: - $(MKDIR_P) BUILD RPMS SOURCES SPECS SRPMS - + mkdir -p BUILD RPMS SOURCES SPECS SRPMS -- cgit v1.2.1