X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=a359ac00d229e52e17889078206e76b86a410afd;hb=refs%2Ftags%2F1.0.17;hp=95d97653ef5b9f150f745d287f52074d3207dff0;hpb=f99863fd1d714d1c551a2afb04fd6db4ffb741a3;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 95d97653..a359ac00 100644
--- 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
@@ -64,7 +73,6 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include poll/include.am
 include rpm/include.am
 include support/include.am
 include tests/include.am
@@ -72,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
@@ -90,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
@@ -106,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
@@ -139,7 +151,3 @@ maintainer-clean-local:
 	-rm -f m4/lt~obsolete.m4
 	-rmdir build-aux
 	-rm -rf ${top_builddir}/html
-
-install-website: html-local
-	-rm -r -f /var/www/libmemcached/*
-	@cp -r docs/html /var/www/libmemcached