Updates, rpm now tests the install locations.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc..d163202714941cb07d46fe389fe06246813091d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,26 +1,39 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil support clients tests
-EXTRA_dist = README.FIRST
+# includes append to these:
+SUFFIXES =
+PHONY =
+TESTS =
+CLEANFILES =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+include_HEADERS =
+nobase_include_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
+
+SUBDIRS = docs
+
+test-docs:
+       (cd docs && $(MAKE) test-docs)
+include libmemcached/include.am
+include clients/include.am
+include libhashkit/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:
-       @(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 .
@@ -28,9 +41,16 @@ 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 .
 
 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
+