X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=6aa50af828b6dec8e3734975648dc4daf68195db;hb=a715b9a10e64a190ed868bb79ccd78f4f0d6a7f7;hp=7f6e0386256e0cfdf359a29804e528f69ebce86d;hpb=2897ccfa82591bd17d02c344465c4a74e3b3dbae;p=awesomized%2Flibmemcached diff --git a/Makefile.am b/Makefile.am index 7f6e0386..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 @@ -71,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