X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=d163202714941cb07d46fe389fe06246813091d4;hb=ab2154ec9b3c87fbd414176aeed0ccfebbb8bf2b;hp=446e8ae8bd45bb474ed7bdfe3187502d275b6b72;hpb=259796df2149b11286d58158255f868cadb470bb;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 446e8ae8..d1632027 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,56 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
+
+# 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
 
-SUBDIRS = docs libmemcached libmemcachedutil tests support clients
-EXTRA_dist = README.FIRST
-
-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 ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+	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 .
 
 generic:
-	rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+	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
+