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

diff --git a/Makefile.am b/Makefile.am
index 6bc18c4e..672ac763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,36 @@
-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 $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES
-	rpm -ba support/libmemcached.spec
-	cp /usr/src/redhat/RPMS/i386/$(DISTVNAME)*.i386.rpm .
-	cp /usr/src/redhat/SRPMS/$(DISTVNAME)*.src.rpm .
+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)
+
+test-extended: all
+	@(cd tests; ${MAKE} test-extended)
+
+valgrind:
+	@(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 ~/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 ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+
+rpm: all dist generic fedora