X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=6aa50af828b6dec8e3734975648dc4daf68195db;hb=a715b9a10e64a190ed868bb79ccd78f4f0d6a7f7;hp=f5c63863b8565d7e7a31c207ea0da315ad4c928e;hpb=e23d774aaee5cf66ff4dc563f5b0a2cad293dd82;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index f5c63863..6aa50af8 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,11 @@ include util/include.am
 include win32/include.am
 
 include m4/include.am
+endif
 
+TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
 merge-clean:
 	@find ./ | $(GREP) \.gcda | xargs rm -f