X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=95382924e5482886040ea24d3b02a32c3ec6d7c7;hb=e1bef1f4995da44ca3f19246ed90b54fed0c7e07;hp=b864c31d884e1c021043ef62732769fff632124c;hpb=232a337899ee121d8ad4852862ee56bfb4b864fa;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index b864c31d..95382924 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,34 @@
+ACLOCAL_AMFLAGS = -I config
 INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
 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)
 
-rpm: all dist
-	cp libmemcached-$(VERSION).tar.gz /home/brian/rpm/SOURCES/
+test-no-outputdiff:
+	@(cd tests; ${MAKE} test-no-outputdiff)
+
+fedora:
+	rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm ~/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 ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+	cp libmemcached-$(VERSION).tar.gz /home/brian/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