X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=eeab710a4aad9c6588ec01b86f597461c911f021;hb=e926cd518e3605dd3fa050734061a5fabf5460bd;hp=7c23b7411e4afbc1ff873a6cc608686498ffa039;hpb=82b9ad4652c38c7fc0a31505fd38f95246e379f9;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 7c23b741..eeab710a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,36 @@
-INCLUDES = include
-SUBDIRS = docs include lib src tests support
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached support clients tests example
 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