projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Clean up interfaces so that 1.2 is a bit easier to upgrade too.
[m6w6/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 7f6e0386256e0cfdf359a29804e528f69ebce86d..6aa50af828b6dec8e3734975648dc4daf68195db 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-6,6
+6,7
@@
ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
SUFFIXES =
.PHONY =
TESTS =
SUFFIXES =
.PHONY =
TESTS =
+XFAIL_TESTS =
CLEANFILES =
DISTCLEANFILES =
bin_PROGRAMS =
CLEANFILES =
DISTCLEANFILES =
bin_PROGRAMS =
@@
-35,6
+36,14
@@
EXTRA_DIST+= README.win32
aclocaldir= $(datadir)/aclocal
dist_aclocal_DATA=
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 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
include win32/include.am
include m4/include.am
+endif
+TESTS += ${bin_PROGRAMS}
TESTS += ${check_PROGRAMS}
TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
merge-clean:
@find ./ | $(GREP) \.gcda | xargs rm -f
merge-clean:
@find ./ | $(GREP) \.gcda | xargs rm -f