X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=672ac763adbafe7dd8c0fb7f87a4f7c98326c1bc;hb=f0a23a11e302baf7228aaf17d61fd2ea17d7df8d;hp=6b05f81f7e880e7c4cb9800c00c65e6308fe31a5;hpb=aef60cba06c79c42f79532923aa49675386c552f;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 6b05f81f..672ac763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,36 @@
-INCLUDES = include
-SUBDIRS = docs include lib src tests
-
-test: all
-	cd tests; make test; cd ..
-
-ltest: all 
-	./tests/testapp output.txt
-
-valgrind:
-	cd tests; make valgrind; cd ..
-
-
+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