X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=2c2760160a862144f2541861679a0054adaafcd9;hb=08cb9372fc4a1c660aeac3a89c5fe066538e8624;hp=d2acebaa4658258582dd8e4b712c90d91b5223f1;hpb=3cc0dd0ea0b37e346bbc187042c76149f2870ebf;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index d2acebaa..2c276016 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,19 +5,23 @@ 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= \
 	    ${srcdir}/m4/pandora_*.m4 \
 	    .quickly \
 	    README.FIRST \
+	    README.win32 \
 	    config/autorun.sh \
 	    config/pandora-plugin \
 	    config/uncrustify.cfg \
@@ -29,19 +33,21 @@ EXTRA_DIST= \
 	    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:
@@ -60,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
@@ -72,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 "	------------------------------------------------------"
@@ -82,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