Moved clients and libmemcached to being included in root build.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index affdae1977275ea49d04614a80b5be5cf1d10e8f..5dd028a7555cba0f075b4da96604414ec990ea6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,23 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil support clients tests example
-EXTRA_dist = README.FIRST
+# includes append to these:
+SUFFIXES =
+TESTS =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+pkginclude_HEADERS =
+nobase_pkginclude_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
+
+SUBDIRS = . docs support tests example 
+
+include libmemcached/include.am
+include clients/include.am
 
 check-local: test-no-outputdiff
 
@@ -11,7 +27,7 @@ test: all
 test-extended: all
        @(cd tests; ${MAKE} test-extended)
 
-valgrind:
+valgrind: all
        @(cd tests; ${MAKE} valgrind)
 
 test-no-outputdiff:
@@ -34,3 +50,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)