X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=80b2c03eaf130b9b3d84725f0bcb0c028d5c3215;hb=b50e6755f3e6d65ace83556640d86ffc43dc7c1e;hp=b9fec57ec2c35695a95ea7d5c0efb1cd77c7b155;hpb=4fe35ea1372eda035618c6e961f421187d3ae837;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index b9fec57e..80b2c03e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,11 @@ SUFFIXES =
 PHONY =
 TESTS =
 CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
@@ -15,7 +17,6 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-DISTCLEANFILES=
 EXTRA_DIST= \
 	    ${srcdir}/m4/pandora_*.m4 \
 	    .quickly \
@@ -32,17 +33,7 @@ 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
@@ -51,8 +42,10 @@ include example/include.am
 include support/include.am
 include poll/include.am
 include win32/include.am
+include docs/include.am
 
 TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
 
 fedora:
@@ -71,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
@@ -83,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 "	------------------------------------------------------"