attempt to fix #12, #49 and #65

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7432e682d45d3cb5fe2dbc429892d5cc7c8e7c47..789e6dcffcbb1c939eb101c794237affddb65364 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,10 @@ EXTRA_DIST=
 dist_man_MANS=
 MAINTAINERCLEANFILES=
 
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
@@ -57,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
@@ -74,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
@@ -83,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
 
@@ -96,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
@@ -104,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
@@ -126,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
@@ -141,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
@@ -154,4 +151,4 @@ maintainer-clean-local:
        -rm -f m4/test-driver
        -rmdir build-aux
        -rm -rf ${top_builddir}/html
-       -rm -f bootstrap
+       -rm -f $(DIST_ARCHIVES)