Update from build trunk.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7f6e0386256e0cfdf359a29804e528f69ebce86d..a359ac00d229e52e17889078206e76b86a410afd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -35,6 +36,14 @@ 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
@@ -71,8 +80,13 @@ include util/include.am
 include win32/include.am
 
 include m4/include.am
+endif
 
+TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
+
+if ! BUILD_WIN32
 
 merge-clean:
        @find ./ | $(GREP) \.gcda | xargs rm -f
@@ -89,8 +103,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-docs-check
+
 
 lcov: lcov-clean check
        @echo
@@ -105,11 +119,10 @@ 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