Merge in solution for lp:581030.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 99687ed6e7a84dd2cf387e63f19496fb643592e8..31585120cae1d8ff2ec87602823017247202e72e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,22 +12,45 @@ 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
 
+TEST_DOCS=
+if BUILD_DOCS
 SUBDIRS = docs
+TEST_DOCS+=test-docs
+endif
 
 test-docs:
        (cd docs && $(MAKE) test-docs)
 include libmemcached/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
 
-check-local: test-no-outputdiff
+TESTS += ${check_PROGRAMS}
 
 
 fedora:
@@ -49,8 +72,12 @@ generic:
 rpm: all 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
 
@@ -64,9 +91,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