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

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c6b23a43cfc23626799c154045b9d4b12e6e821d..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,24 +36,43 @@ 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
 include libmemcached-1.0/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
 include libmemcachedprotocol-0.0/include.am
+endif
+
 include libmemcachedutil-1.0/include.am
 
 include clients/include.am
 include docs/include.am
 include man/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
 include example/include.am
+endif
+
 include libhashkit/include.am
 include libmemcached/include.am
 include libmemcachedutil/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
 include libmemcachedprotocol/include.am
+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
@@ -60,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
@@ -116,7 +139,7 @@ maintainer-clean-local:
        -rm -f build-aux/install-sh
        -rm -f build-aux/ltmain.sh
        -rm -f build-aux/missing
-       -rm -f config.in
+       -rm -f mem_config.in
        -rm -f config.log
        -rm -f config.status
        -rm -f configure
@@ -126,7 +149,4 @@ maintainer-clean-local:
        -rm -f m4/ltversion.m4
        -rm -f m4/lt~obsolete.m4
        -rmdir build-aux
-
-install-website: html-local
-       @rm -r -f /var/www/libmemcached/*
-       @cp -r docs/html /var/www/libmemcached
+       -rm -rf ${top_builddir}/html