Test cleanup, extended error system to record host.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 99687ed6e7a84dd2cf387e63f19496fb643592e8..2c2760160a862144f2541861679a0054adaafcd9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,29 +5,49 @@ SUFFIXES =
 PHONY =
 TESTS =
 CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-EXTRA_DIST = README.FIRST
+EXTRA_DIST= \
+           ${srcdir}/m4/pandora_*.m4 \
+           .quickly \
+           README.FIRST \
+           README.win32 \
+           config/autorun.sh \
+           config/pandora-plugin \
+           config/uncrustify.cfg \
+           m4/ac_cxx_header_stdcxx_98.m4 \
+           m4/acx_pthread.m4  \
+           m4/gettext.m4 \
+           m4/iconv.m4 \
+           m4/pkg.m4 \
+           m4/po.m4 \
+           m4/progtest.m4
 
-SUBDIRS = docs
-
-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 libhashkit/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
 
-check-local: test-no-outputdiff
+TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
 
 fedora:
@@ -46,14 +66,21 @@ 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
+       find ./ | $(GREP) \.gcno | xargs rm -f
+       find ./ | $(GREP) \.gz | xargs rm -f
        find ./ | $(GREP) \.orig | xargs rm -f
        find ./ | $(GREP) \.rej | xargs rm -f
+       find ./ | $(GREP) \.rpm | xargs rm -f
        find ./ | $(GREP) \~$$ | xargs rm -f
        bzr unknowns
 
+clean-local:
+       -rm -rf docs/_build docs/doctrees
+
 lcov: lcov-clean check
        @echo
        @echo " ------------------------------------------------------"
@@ -64,9 +91,8 @@ 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
 
-
-
+DISTCLEANFILES+= config/top.h