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

diff --git a/Makefile.am b/Makefile.am
index cbec4971..868ea873 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +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)
 
 test-extended: all
 	@(cd tests; ${MAKE} test-extended)
 
-valgrind:
+valgrind: all
 	@(cd tests; ${MAKE} valgrind)
 
 test-no-outputdiff:
 	@(cd tests; ${MAKE} test-no-outputdiff)
 
-rpm: all dist
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpm/SOURCES/
+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 /home/brian/rpm/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpm/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)