X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=e687f9ceed3a6e36ee56b8bf4c68b06cc7e0ec9a;hb=7f9bc55d79a4e7133fdeaaa1150451717c103b28;hp=affdae1977275ea49d04614a80b5be5cf1d10e8f;hpb=b30880274b5b866db3780148eaf9bf36e09bb1fb;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index affdae19..e687f9ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil support clients tests example
+SUBDIRS = docs libmemcached support clients tests example
 EXTRA_dist = README.FIRST
 
 check-local: test-no-outputdiff
@@ -11,7 +11,7 @@ test: all
 test-extended: all
 	@(cd tests; ${MAKE} test-extended)
 
-valgrind:
+valgrind: all
 	@(cd tests; ${MAKE} valgrind)
 
 test-no-outputdiff:
@@ -34,3 +34,12 @@ generic:
 	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)