X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=7a09b51f35a9fff850a171aa7e13cc33eb20430e;hb=abc87c2867661669e897142dbfd531e32a14981b;hp=a410902c0fef596fd211f771c002d9978191e3d7;hpb=7a30c7f272a75be40015a5817007c5c7d0aeb406;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index a410902c..7a09b51f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,36 +12,46 @@ noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
+DISTCLEANFILES=
 EXTRA_DIST= \
-						${srcdir}/m4/pandora_*.m4 \
-						.quickly \
-						README.FIRST \
-						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
-
+	    ${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:
@@ -82,9 +92,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