X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=80b2c03eaf130b9b3d84725f0bcb0c028d5c3215;hb=3b59a154e949a78ee379b0dbd6e91d91f2c3a385;hp=c57267724b7b35e7a24e22c8205c5d911c0671a2;hpb=8efc3d2ea707db56a5443858af71550524eda977;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index c5726772..80b2c03e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,34 +5,47 @@ 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 \
-						README.FIRST \
-						config/autorun.sh \
-						m4/pkg.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
 
-
-SUBDIRS = docs
-
-test-docs:
-	(cd docs && $(MAKE) test-docs)
+include libtest/include.am
 include libmemcached/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:
@@ -51,7 +64,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
@@ -63,6 +76,9 @@ merge-clean:
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
 
+clean-local:
+	-rm -rf docs/_build docs/doctrees
+
 lcov: lcov-clean check
 	@echo
 	@echo "	------------------------------------------------------"
@@ -73,9 +89,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