Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-200

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95d97653ef5b9f150f745d287f52074d3207dff0..6aa50af828b6dec8e3734975648dc4daf68195db 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
@@ -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
@@ -139,7 +150,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