X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc;hb=c204651e1ee8185224ccc78bd68801ab43740844;hp=51c7b70621a6726d6b1665d4927dfff65733e94b;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 51c7b706..672ac763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,36 @@
-INCLUDES = include
-SUBDIRS = docs include lib src tests support
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached libmemcachedutil support clients tests
+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:
-	cd tests; make valgrind; cd ..
+	@(cd tests; ${MAKE} valgrind)
 
-valgrind-extended:
-	cd tests; make valgrind-extended; cd ..
+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 ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all dist
+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