ICC cleanups

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6bc18c4e1c9ea020f98b3cd8a4008e61d820a214..868ea873977101976fae4ec81abf5a63e8a87f9a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,45 @@
-INCLUDES = include\r
-SUBDIRS = docs include lib src tests support\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
-rpm: all dist\r
-       cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES\r
-       rpm -ba support/libmemcached.spec\r
-       cp /usr/src/redhat/RPMS/i386/$(DISTVNAME)*.i386.rpm .\r
-       cp /usr/src/redhat/SRPMS/$(DISTVNAME)*.src.rpm .\r
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached libhashkit 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: all
+       @(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 ~/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 ~/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
+
+merge-clean:
+       find ./ | $(GREP) \.orig | xargs rm -f
+       find ./ | $(GREP) \.rej | xargs rm -f
+       find ./ | $(GREP) \~$$ | xargs rm -f
+       bzr unknowns
+
+hudson-valgrind: all
+       @(cd tests; ${MAKE} hudson-valgrind)