Update RPM rules.

diff --git a/GNUmakefile b/GNUmakefile
index 33ec5acc4415ee30931807e07585b9eb7a33b76d..b105d0131e2f41122c3580c0dc58ab0124ea1bd8 100644 (file)
--- 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 7432e682d45d3cb5fe2dbc429892d5cc7c8e7c47..a64dc9c36912b3eb3101704921ea00671216e3bc 100644 (file)
--- 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 e74ebb7b0f5b49936e4e73ae9d7628b2fbae10e2..4d241ea7bb9f013559639f908fa2784ef4681912 100644 (file)
--- 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 20967ab6c3ec7fd41140d0721e295c87be6c747f..2d60a1c4cbca898a8f8af63d0d7753aee4fbb1c4 100644 (file)
--- 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