X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=789e6dcffcbb1c939eb101c794237affddb65364;hb=ae6ce3499b07751cb8b72c960a2a0edfcd4c83a1;hp=cc65cb781bbbb5fbe9e9f1101397d99a8886eda2;hpb=5f767fd094e7485c8e4799a04f550806280540e9;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index cc65cb78..789e6dcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,15 @@ EXTRA_DIST=
 dist_man_MANS=
 MAINTAINERCLEANFILES=
 
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
 DISTCLEANFILES+= aminclude.am
 
-EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
 
@@ -58,7 +61,7 @@ endif
 include libmemcachedutil-1.0/include.am
 
 include clients/include.am
-include docs/include.am
+
 include man/include.am
 
 if BUILD_LIBMEMCACHED_PROTOCOL
@@ -75,7 +78,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -84,9 +87,7 @@ include win32/include.am
 include m4/include.am
 endif
 
-TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
-XFAIL_TESTS += ${bin_PROGRAMS}
 
 if ! BUILD_WIN32
 
@@ -97,7 +98,6 @@ merge-clean:
 	@find ./ | $(GREP) \.moved | xargs rm -r -f
 	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f
@@ -105,7 +105,7 @@ merge-clean:
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns
 
-clean-local: clean-libtest-check clean-docs-check
+clean-local: clean-libtest-check clean-rpm
 
 
 lcov: lcov-clean check
@@ -127,12 +127,7 @@ DISTCLEANFILES+= config/top.h
 
 maintainer-clean-local:
 	find . -type f -name '*~' -exec rm -f '{}' \;
-	-rm -f @PACKAGE@-*.rpm
-	-rm -f @PACKAGE@-*.tar.gz
-	-rm -f man/*.1
-	-rm -f man/*.3
-	-rm -f man/*.8
-	-rm -rf man/.doctrees/
+	-$(RM) $(dist_man_MANS)
 	-rm -f Makefile.in
 	-rm -f aclocal.m4
 	-rm -f build-aux/compile
@@ -142,6 +137,7 @@ maintainer-clean-local:
 	-rm -f build-aux/install-sh
 	-rm -f build-aux/ltmain.sh
 	-rm -f build-aux/missing
+	-rm -f build-aux/test-driver
 	-rm -f build-aux/ylwrap
 	-rm -f mem_config.in
 	-rm -f config.log
@@ -152,5 +148,7 @@ maintainer-clean-local:
 	-rm -f m4/ltsugar.m4
 	-rm -f m4/ltversion.m4
 	-rm -f m4/lt~obsolete.m4
+	-rm -f m4/test-driver
 	-rmdir build-aux
 	-rm -rf ${top_builddir}/html
+	-rm -f $(DIST_ARCHIVES)