X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=f807c697fd3730b07457f6b1f5785a2bdbb66ec7;hb=dec0636927f5d0ae4cf06ad2710d022990419879;hp=3148c62b504c6200ea6ee5f2529371969c4f6739;hpb=4cf3ce236b4a17092ca192becbd0a2f30d0ac576;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 3148c62b..f807c697 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil tests support clients
+SUBDIRS = docs libmemcached support clients tests example libhashkit
 EXTRA_dist = README.FIRST
 
 check-local: test-no-outputdiff
@@ -11,26 +11,35 @@ test: all
 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)