X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=cc65cb781bbbb5fbe9e9f1101397d99a8886eda2;hb=f1b882e65cb7da1344405d25d5c4db150785ee59;hp=dcf1519afed67a55aec43171dc82cd45036b552e;hpb=fa5dde3af5a99cda67d0ab005393cfd1627bd3d5;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index dcf1519a..cc65cb78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,13 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -17,6 +19,7 @@ noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_LTLIBRARIES=
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
@@ -35,6 +38,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 +75,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 +82,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 +105,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 +121,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
@@ -128,7 +142,8 @@ 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 build-aux/ylwrap
+	-rm -f mem_config.in
 	-rm -f config.log
 	-rm -f config.status
 	-rm -f configure
@@ -138,7 +153,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