X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=868ea873977101976fae4ec81abf5a63e8a87f9a;hb=824533fd2626b1060855e543aaad381675ae2695;hp=5cc8d5c5e5d0f6eb011e18e201611655757a414b;hpb=57408dce015f0d55d7c0f99113567d9d5e89618d;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 5cc8d5c5..868ea873 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,45 @@
-INCLUDES = include
-SUBDIRS = docs include lib src tests support
-
-test: all
-	cd tests; make test; cd ..
-
-test-extended: all
-	cd tests; make test-extended; cd ..
-
-valgrind:
-	cd tests; make valgrind; cd ..
-
-valgrind-extended:
-	cd tests; make valgrind-extended; cd ..
-
-
-rpm: all dist
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
-	rpmbuild -ba support/libmemcached.spec
-	cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached libhashkit support clients tests example
+EXTRA_dist = README.FIRST
+
+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 ~/rpmbuild/SOURCES/
+	rpmbuild -ba support/libmemcached.spec
+	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+generic:
+	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
+
+hudson-valgrind: all
+	@(cd tests; ${MAKE} hudson-valgrind)