X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=868ea873977101976fae4ec81abf5a63e8a87f9a;hb=824533fd2626b1060855e543aaad381675ae2695;hp=33520339e2ee3b17105f8830a328979f9fad96b1;hpb=5a0dc3338c04b40a5d6f335ac6504e9d3f7fd90d;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 33520339..868ea873 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,45 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil tests support clients
+SUBDIRS = docs libmemcached libhashkit support clients tests example
 EXTRA_dist = README.FIRST
 
+check-local: test-no-outputdiff
+
 test: all
 	@(cd tests; ${MAKE} test)
 
 test-extended: all
 	@(cd tests; ${MAKE} test-extended)
 
-valgrind:
+valgrind: all
 	@(cd tests; ${MAKE} valgrind)
 
 test-no-outputdiff:
 	@(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
-	rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+	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:
-	rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+	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 .
 
 rpm: all dist generic fedora
+
+merge-clean:
+	find ./ | $(GREP) \.orig | xargs rm -f
+	find ./ | $(GREP) \.rej | xargs rm -f
+	find ./ | $(GREP) \~$$ | xargs rm -f
+	bzr unknowns
+
+hudson-valgrind: all
+	@(cd tests; ${MAKE} hudson-valgrind)