Merge Monty.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5dd028a7555cba0f075b4da96604414ec990ea6a..09db5e9445f931a76bad70f497a04fcdc2875d2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
+PHONY =
 TESTS =
+CLEANFILES = 
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
@@ -14,29 +16,21 @@ EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST
 
-SUBDIRS = . docs support tests example 
+SUBDIRS = docs libhashkit
 
 include libmemcached/include.am
 include clients/include.am
+include tests/include.am
+include example/include.am
+include support/include.am
 
 check-local: test-no-outputdiff
 
-test: all
-       @(cd tests; ${MAKE} test)
-
-test-extended: all
-       @(cd tests; ${MAKE} test-extended)
-
-valgrind: all
-       @(cd tests; ${MAKE} valgrind)
-
-test-no-outputdiff:
-       @(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
        rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
        rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-       cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+       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 .
@@ -44,7 +38,7 @@ fedora:
 generic:
        rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
        rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-       cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+       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 .
@@ -57,5 +51,3 @@ merge-clean:
        find ./ | $(GREP) \~$$ | xargs rm -f
        bzr unknowns
 
-hudson-valgrind: all
-       @(cd tests; ${MAKE} hudson-valgrind)