X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc;hb=1295ca066dea59f44361619f4e59b1789cd02594;hp=b9213a759eb53eb49fed49b72bafa4ca8a1cffdc;hpb=34a8c3858f30b02568c87f56a827f618aba6d6be;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index b9213a75..672ac763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,36 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached libmemcachedutil support clients tests
 EXTRA_dist = README.FIRST
 
+check-local: test-no-outputdiff
+
 test: all
-	cd tests; make test; cd ..
+	@(cd tests; ${MAKE} test)
 
 test-extended: all
-	cd tests; make test-extended; cd ..
+	@(cd tests; ${MAKE} test-extended)
 
 valgrind:
-	cd tests; make valgrind; cd ..
+	@(cd tests; ${MAKE} valgrind)
 
-rpm: all dist
+test-no-outputdiff:
+	@(cd tests; ${MAKE} test-no-outputdiff)
+
+fedora:
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
 	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
 	rpmbuild -ba support/libmemcached.spec
-	cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+generic:
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+	rpmbuild -ba support/libmemcached.spec
+	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+rpm: all dist generic fedora