attempt to fix cachedump test

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5c63863b8565d7e7a31c207ea0da315ad4c928e..789e6dcffcbb1c939eb101c794237affddb65364 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,13 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -17,24 +19,36 @@ noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_LTLIBRARIES=
 EXTRA_HEADERS =
 BUILT_SOURCES=
 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
 
 aclocaldir= $(datadir)/aclocal
 dist_aclocal_DATA=
 
+# Build targets for Windows
+if BUILD_WIN32
+include libhashkit-1.0/include.am
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcached-1.0/include.am
+else
+
 include libtest/include.am
 
 include libhashkit-1.0/include.am
@@ -47,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
@@ -64,17 +78,19 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include poll/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
 
 include m4/include.am
+endif
 
 TESTS += ${check_PROGRAMS}
 
+if ! BUILD_WIN32
+
 merge-clean:
        @find ./ | $(GREP) \.gcda | xargs rm -f
        @find ./ | $(GREP) \.gcno | xargs rm -f
@@ -82,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
@@ -90,8 +105,8 @@ merge-clean:
        @echo "Files that need to be either removed or checked in:"
        @bzr unknowns
 
-clean-local:
-       -rm -rf docs/_build docs/doctrees
+clean-local: clean-libtest-check clean-rpm
+
 
 lcov: lcov-clean check
        @echo
@@ -106,19 +121,13 @@ lcov-clean: clean
        @rm -rf lcov */lcov.out
        @find . -name '*.gcno' | xargs rm -f
        @find . -name '*.gcda' | xargs rm -f
+endif
 
 DISTCLEANFILES+= config/top.h
 
-clean-local: clean-libtest-check clean-docs-check
-
 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
@@ -128,6 +137,8 @@ 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
        -rm -f config.status
@@ -137,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)