Updates, rpm now tests the install locations.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5cc8d5c5e5d0f6eb011e18e201611655757a414b..d163202714941cb07d46fe389fe06246813091d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,56 @@
-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 libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/\r
-       rpmbuild -ba support/libmemcached.spec\r
-       cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .\r
-       cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .\r
+ACLOCAL_AMFLAGS = -I m4
+
+# includes append to these:
+SUFFIXES =
+PHONY =
+TESTS =
+CLEANFILES =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+include_HEADERS =
+nobase_include_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
+
+SUBDIRS = docs
+
+test-docs:
+       (cd docs && $(MAKE) test-docs)
+include libmemcached/include.am
+include clients/include.am
+include libhashkit/include.am
+include tests/include.am
+include example/include.am
+include support/include.am
+
+check-local: 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
+