ICC fixes

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc..e687f9ceed3a6e36ee56b8bf4c68b06cc7e0ec9a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil support clients tests
+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)