Merge up to gearmand.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4d9d0531ddcaaf26e96bc576b41ec99af211c046..fa4bf7260f4b29c6bc17a422601790737fdd84a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
@@ -48,6 +48,7 @@ include libmemcachedprotocol/include.am
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
 include poll/include.am
+include rpm.am
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -60,34 +61,6 @@ TESTS += ${check_PROGRAMS}
 
 EXTRA_DIST+= ${man_MANS}
 
-fedora:
-       @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-       @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-       @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-       @rpmbuild -ba support/libmemcached.spec
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-generic: support/libmemcached.spec
-       @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-       @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-       @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-       @rpmbuild -ba support/libmemcached.spec
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-rpm: man distcheck generic
-
-release: rpm
-       @rpm --addsign libmemcached-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
-
 merge-clean:
        @find ./ | $(GREP) \.gcda | xargs rm -f
        @find ./ | $(GREP) \.gcno | xargs rm -f