X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=fa4bf7260f4b29c6bc17a422601790737fdd84a9;hb=25efe3485198149616820ab4e52d2f18f0abe5a7;hp=61bee31780e92cc580ce66a7e449482ca83fb12f;hpb=68ad48824e7162a490cce315756c5fa3f98d3e31;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 61bee317..fa4bf726 100644
--- 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,39 +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 .
-
-clean_rpm:
-	@rm -f *.tar.gz
-	@rm -f *.src.rpm
-	@rm -f *.rpm
-
-rpm: clean_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