summaryrefslogtreecommitdiff
path: root/cpp/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2006-12-23 17:20:37 +0000
committerAlan Conway <aconway@apache.org>2006-12-23 17:20:37 +0000
commit6536407690660e10529c826ab3aa21baaa121ea1 (patch)
treeaacbd4397be2fc04e394d77f83732bd77e5f4b99 /cpp/Makefile.am
parenta958033ea68c9154da02d4378c4031f9dc02897e (diff)
downloadqpid-python-6536407690660e10529c826ab3aa21baaa121ea1.tar.gz
- 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
Diffstat (limited to 'cpp/Makefile.am')
-rw-r--r--cpp/Makefile.am16
1 files changed, 4 insertions, 12 deletions
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) $@