X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=e687f9ceed3a6e36ee56b8bf4c68b06cc7e0ec9a;hb=7f9bc55d79a4e7133fdeaaa1150451717c103b28;hp=c2de2f6d37e58a6163e8bfca1ec3c0b631dcbfdc;hpb=f05cd5b77ca7b17440bfc7ed9f48f7c11d269767;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index c2de2f6d..e687f9ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,45 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached libmemcachedutil tests support clients
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached 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:
+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 /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 .
+	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 /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 .
+	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)