X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b9fec57ec2c35695a95ea7d5c0efb1cd77c7b155;hb=aeb7c171a08d06ae366d752061a8e8f1b14beb08;hp=38f87c5e76f02c643bba3927fb707831afb4ec89;hpb=49a02c953ab03f71b819e7a5f68ef7a0e5857544;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 38f87c5e..b9fec57e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,13 +12,15 @@ noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
-check_PROGRAMS = 
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
+DISTCLEANFILES=
 EXTRA_DIST= \
 	    ${srcdir}/m4/pandora_*.m4 \
 	    .quickly \
 	    README.FIRST \
+	    README.win32 \
 	    config/autorun.sh \
 	    config/pandora-plugin \
 	    config/uncrustify.cfg \
@@ -30,23 +32,28 @@ 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
 
 TESTS += ${check_PROGRAMS}
 
-check-local: test-no-outputdiff
-
 
 fedora:
 	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
@@ -86,9 +93,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