X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=79b4cc7ae70ea59b7b77c80ed1054826f46ced13;hb=54f01e08b61f4463a9659da7b329c7de04a41dce;hp=386494118ee63d15b4eb94db850c2213b48d7644;hpb=d19633c9a900fbf48d87d49d7202c7b60036e620;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 38649411..79b4cc7a 100644
--- 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 =
@@ -19,6 +21,7 @@ EXTRA_DIST= \
 	    ${srcdir}/m4/pandora_*.m4 \
 	    .quickly \
 	    README.FIRST \
+	    README.win32 \
 	    config/autorun.sh \
 	    config/pandora-plugin \
 	    config/uncrustify.cfg \
@@ -30,23 +33,19 @@ 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
+include poll/include.am
+include win32/include.am
+include docs/include.am
 
 TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
 
 fedora:
@@ -77,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 "	------------------------------------------------------"
@@ -91,5 +93,6 @@ lcov-clean: clean
 	find . -name '*.gcno' | xargs rm -f
 	find . -name '*.gcda' | xargs rm -f
 
+CLEANFILES+= config/top.h