X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=868ea873977101976fae4ec81abf5a63e8a87f9a;hb=824533fd2626b1060855e543aaad381675ae2695;hp=4e4fb2e8c9fdf35f0d1a3d2a847f2c680d454317;hpb=8fce86636639afaeac4ca0e869e8bcd833324a62;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 4e4fb2e8..868ea873 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,45 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+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; cd ..
+	@(cd tests; ${MAKE} test)
 
 test-extended: all
-	cd tests; make test-extended; cd ..
+	@(cd tests; ${MAKE} test-extended)
+
+valgrind: all
+	@(cd tests; ${MAKE} valgrind)
+
+test-no-outputdiff:
+	@(cd tests; ${MAKE} test-no-outputdiff)
 
-valgrind:
-	cd tests; make valgrind; cd ..
+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 .
 
-rpm: all dist
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
+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 /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+	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)