Merging Trond

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 96abe02c4109209b27c5ba7e33445be2be0cc2d6..eeab710a4aad9c6588ec01b86f597461c911f021 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,36 @@
-INCLUDES = include\r
-SUBDIRS = docs include lib src tests\r
-\r
-test: all\r
-       cd tests; make test; cd ..\r
-\r
-test-extended: all\r
-       cd tests; make test-extended; cd ..\r
-\r
-valgrind:\r
-       cd tests; make valgrind; cd ..\r
-\r
-valgrind-extended:\r
-       cd tests; make valgrind-extended; cd ..\r
-\r
-\r
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached 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:
+       @(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