X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=da5f16e2c96264468760613ca36f4ae6f5f98033;hb=58f976626a7636c7b2e87fca0674f709d34f33c0;hp=95382924e5482886040ea24d3b02a32c3ec6d7c7;hpb=a07bb255b72aa59d0f4c4c63bb71695b2e9df537;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 95382924..da5f16e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,55 @@
-ACLOCAL_AMFLAGS = -I config
-INCLUDES = 
-SUBDIRS = docs libmemcached libmemcachedutil tests support clients
-EXTRA_dist = README.FIRST
+ACLOCAL_AMFLAGS = -I m4
 
-test: all
-	@(cd tests; ${MAKE} test)
+# includes append to these:
+SUFFIXES =
+PHONY =
+TESTS =
+CLEANFILES = 
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+pkginclude_HEADERS =
+nobase_pkginclude_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
 
-test-extended: all
-	@(cd tests; ${MAKE} test-extended)
+SUBDIRS = docs libhashkit
 
-valgrind:
-	@(cd tests; ${MAKE} valgrind)
+test-docs:
+	(cd docs && make test-docs)
+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-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
+