Merge in updates to examples.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1260791dbbae4f2bf47151e6691e1f88c1b6fac6..80b2c03eaf130b9b3d84725f0bcb0c028d5c3215 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,11 @@ SUFFIXES =
 PHONY =
 TESTS =
 CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
@@ -31,18 +33,10 @@ EXTRA_DIST= \
            m4/po.m4 \
            m4/progtest.m4
 
-TEST_DOCS=
-if BUILD_DOCS
-SUBDIRS = docs
-TEST_DOCS+=test-docs
-endif
-
-test-docs:
-       (cd docs && $(MAKE) test-docs)
+include libtest/include.am
 include libmemcached/include.am
 include clients/include.am
 include libhashkit/include.am
-include unittests/include.am
 include tests/include.am
 include example/include.am
 include support/include.am
@@ -51,6 +45,7 @@ include win32/include.am
 include docs/include.am
 
 TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
 
 fedora:
@@ -69,7 +64,7 @@ generic:
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all dist generic fedora
+rpm: all man dist generic fedora
 
 merge-clean:
        find ./ | $(GREP) \.gcda | xargs rm -f
@@ -81,6 +76,9 @@ merge-clean:
        find ./ | $(GREP) \~$$ | xargs rm -f
        bzr unknowns
 
+clean-local:
+       -rm -rf docs/_build docs/doctrees
+
 lcov: lcov-clean check
        @echo
        @echo " ------------------------------------------------------"