Merge in updates to all docs/etc.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0728e01d21d6159c080927968ba8e984adb1fd57..79b4cc7ae70ea59b7b77c80ed1054826f46ced13 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,20 +5,23 @@ SUFFIXES =
 PHONY =
 TESTS =
 CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
-check_PROGRAMS = 
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST= \
            ${srcdir}/m4/pandora_*.m4 \
            .quickly \
            README.FIRST \
+           README.win32 \
            config/autorun.sh \
            config/pandora-plugin \
            config/uncrustify.cfg \
@@ -30,20 +33,19 @@ EXTRA_DIST= \
            m4/po.m4 \
            m4/progtest.m4
 
-
-SUBDIRS = docs
-
-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
+include poll/include.am
+include win32/include.am
+include docs/include.am
 
 TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
 
 fedora:
@@ -74,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 " ------------------------------------------------------"
@@ -84,9 +89,10 @@ lcov: lcov-clean check
        genhtml -o lcov --function-coverage -t libmemcached libmemcached/lcov.out
 
 lcov-clean: clean
-       rm -rf lcov */lcov.out 
+       rm -rf lcov */lcov.out
        find . -name '*.gcno' | xargs rm -f
        find . -name '*.gcda' | xargs rm -f
 
+CLEANFILES+= config/top.h