diff options
| author | Brian Aker <brian@tangent.org> | 2014-02-08 16:09:46 -0800 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2014-02-08 16:09:46 -0800 |
| commit | f4fad3ec857e647a47572eb66cc5877f3ae012ae (patch) | |
| tree | 2ea0f5f016878e389cb85ad30fac880ff6a57d2c | |
| parent | 936db34d1c07a0da83d50d6a229d25a98c8192e1 (diff) | |
| download | libmemcached-f4fad3ec857e647a47572eb66cc5877f3ae012ae.tar.gz | |
Update RPM rules.
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | rpm/include.am | 12 |
4 files changed, 11 insertions, 10 deletions
diff --git a/GNUmakefile b/GNUmakefile index 33ec5acc..b105d013 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# -*-Makefile-*- +# vim:ft=make # _bootstrap_Makefile := $(wildcard [M]akefile) _bootstrap_config-status := $(wildcard config.status) diff --git a/Makefile.am b/Makefile.am index 7432e682..a64dc9c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,7 @@ merge-clean: @echo "Files that need to be either removed or checked in:" @bzr unknowns -clean-local: clean-libtest-check clean-docs-check +clean-local: clean-libtest-check clean-docs-check clean-rpm lcov: lcov-clean check @@ -126,7 +126,6 @@ DISTCLEANFILES+= config/top.h maintainer-clean-local: find . -type f -name '*~' -exec rm -f '{}' \; - -rm -f @PACKAGE@-*.rpm -rm -f @PACKAGE@-*.tar.gz -rm -f man/*.1 -rm -f man/*.3 @@ -141,6 +140,7 @@ maintainer-clean-local: -rm -f build-aux/install-sh -rm -f build-aux/ltmain.sh -rm -f build-aux/missing + -rm -f build-aux/test-driver -rm -f build-aux/ylwrap -rm -f mem_config.in -rm -f config.log @@ -154,4 +154,3 @@ maintainer-clean-local: -rm -f m4/test-driver -rmdir build-aux -rm -rf ${top_builddir}/html - -rm -f bootstrap diff --git a/configure.ac b/configure.ac index e74ebb7b..4d241ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,5 @@ +# configure.ac -*- autoconf -*- vim: filetype=config +# # LibmemcacheD # Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/ # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye diff --git a/rpm/include.am b/rpm/include.am index 20967ab6..2d60a1c4 100644 --- a/rpm/include.am +++ b/rpm/include.am @@ -1,7 +1,9 @@ # vim:ft=automake -.PHONY: rpm-build -rpm-build: support/$(PACKAGE).spec distcheck +$(PACKAGE)-$(VERSION).tar.gz: Makefile + $(MAKE) $(AM_MAKEFLAGS) dist-gzip + +$(PACKAGE)-$(VERSION)-1.x86_64.rpm: support/$(PACKAGE).spec $(DIST_ARCHIVES) @rm -f *.rpm @rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm @rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm @@ -27,12 +29,10 @@ rpm-sign: rpm-build .PHONY: clean-rpm clean-rpm: - @rm -f *.tar.gz - @rm -f *.src.rpm - @rm -f *.rpm + @rm -f libmemcached*.rpm .PHONY: rpm -rpm: clean-rpm support/$(PACKAGE).spec rpm-build +rpm: $(PACKAGE)-$(VERSION)-1.x86_64.rpm .PHONY: release release: rpm rpm-sign |