Test cleanup, extended error system to record host.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7a09b51f35a9fff850a171aa7e13cc33eb20430e..2c2760160a862144f2541861679a0054adaafcd9 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 =
@@ -15,7 +17,6 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-DISTCLEANFILES=
 EXTRA_DIST= \
            ${srcdir}/m4/pandora_*.m4 \
            .quickly \
@@ -32,26 +33,21 @@ 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 libmemcached/protocol/include.am
+include libmemcached/util/include.am
 include clients/include.am
-include libtest/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:
@@ -70,7 +66,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
@@ -82,6 +78,9 @@ merge-clean:
        find ./ | $(GREP) \~$$ | xargs rm -f
        bzr unknowns
 
+clean-local:
+       -rm -rf docs/_build docs/doctrees
+
 lcov: lcov-clean check
        @echo
        @echo " ------------------------------------------------------"
@@ -96,6 +95,4 @@ lcov-clean: clean
        find . -name '*.gcno' | xargs rm -f
        find . -name '*.gcda' | xargs rm -f
 
-CLEANFILES+= config/top.h
-
-
+DISTCLEANFILES+= config/top.h