X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc;hb=f0a23a11e302baf7228aaf17d61fd2ea17d7df8d;hp=b864c31d884e1c021043ef62732769fff632124c;hpb=7577cb0a57aa70d9857d42c381f13c7cb60d0056;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index b864c31d..672ac763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,36 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+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)
+
+test-no-outputdiff:
+	@(cd tests; ${MAKE} test-no-outputdiff)
 
-rpm: all dist
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpm/SOURCES/
+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/rpm/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpm/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