Moved clients and libmemcached to being included in root build.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4e4fb2e8c9fdf35f0d1a3d2a847f2c680d454317..5dd028a7555cba0f075b4da96604414ec990ea6a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,61 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
-EXTRA_dist = README.FIRST
+ACLOCAL_AMFLAGS = -I m4
+
+# includes append to these:
+SUFFIXES =
+TESTS =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+pkginclude_HEADERS =
+nobase_pkginclude_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
+
+SUBDIRS = . docs support tests example 
+
+include libmemcached/include.am
+include clients/include.am
+
+check-local: test-no-outputdiff
 
 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: all
+       @(cd tests; ${MAKE} valgrind)
 
-valgrind:
-       cd tests; make valgrind; cd ..
+test-no-outputdiff:
+       @(cd tests; ${MAKE} test-no-outputdiff)
 
-rpm: all dist
+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 /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-       cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+       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
+
+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)