From 6536407690660e10529c826ab3aa21baaa121ea1 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 23 Dec 2006 17:20:37 +0000 Subject: - rpm: make rpm now builds RPMs under rpm/ directory. - src/qpidd.cpp: added --daemon option to run as daemon. - etc/qpidd: fixed bugs in init.rc script. - qpidc.spec: fixed rpmlint warnings, added apache URL git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489905 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/Makefile.am | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'cpp/Makefile.am') diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 9bcec9b312..703266f8e9 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -3,21 +3,13 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 README.txt etc/qpidd -SUBDIRS = gen lib tests src docs/api docs/man +SUBDIRS = gen lib tests src docs/api docs/man rpm # Update libtool, if needed. libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck -# Convenience targets for making RPMs. -RPM_TAR=/usr/src/redhat/SOURCES/$(distdir).tar.gz +.PHONY: rpm srpm -$(RPM_TAR): dist-gzip - cp $(distdir).tar.gz $(RPM_TAR) - rpmbuild -bs -v qpidc.spec - -srpm: $(RPM_TAR) - rpmbuild -bs -v qpidc.spec - -rpm: $(RPM_TAR) - rpmbuild -ba -v qpidc.spec +rpm srpm: + cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@ -- cgit v1.2.1