projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Second update.
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 95d97653ef5b9f150f745d287f52074d3207dff0..6a851b5036b5b11249b611ca959fb7175f837786 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,11
+1,13
@@
# vim:ft=automake
# 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 =
# includes append to these:
SUFFIXES =
.PHONY =
TESTS =
+XFAIL_TESTS =
CLEANFILES =
DISTCLEANFILES =
bin_PROGRAMS =
CLEANFILES =
DISTCLEANFILES =
bin_PROGRAMS =
@@
-35,6
+37,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
@@
-64,7
+74,6
@@
endif
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
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
include rpm/include.am
include support/include.am
include tests/include.am
@@
-72,8
+81,13
@@
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}
+
+if ! BUILD_WIN32
merge-clean:
@find ./ | $(GREP) \.gcda | xargs rm -f
merge-clean:
@find ./ | $(GREP) \.gcda | xargs rm -f
@@
-90,8
+104,8
@@
merge-clean:
@echo "Files that need to be either removed or checked in:"
@bzr unknowns
@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
lcov: lcov-clean check
@echo
@@
-106,11
+120,10
@@
lcov-clean: clean
@rm -rf lcov */lcov.out
@find . -name '*.gcno' | xargs rm -f
@find . -name '*.gcda' | xargs rm -f
@rm -rf lcov */lcov.out
@find . -name '*.gcno' | xargs rm -f
@find . -name '*.gcda' | xargs rm -f
+endif
DISTCLEANFILES+= config/top.h
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
maintainer-clean-local:
find . -type f -name '*~' -exec rm -f '{}' \;
-rm -f @PACKAGE@-*.rpm
@@
-128,6
+141,7
@@
maintainer-clean-local:
-rm -f build-aux/install-sh
-rm -f build-aux/ltmain.sh
-rm -f build-aux/missing
-rm -f build-aux/install-sh
-rm -f build-aux/ltmain.sh
-rm -f build-aux/missing
+ -rm -f build-aux/ylwrap
-rm -f mem_config.in
-rm -f config.log
-rm -f config.status
-rm -f mem_config.in
-rm -f config.log
-rm -f config.status
@@
-139,7
+153,3
@@
maintainer-clean-local:
-rm -f m4/lt~obsolete.m4
-rmdir build-aux
-rm -rf ${top_builddir}/html
-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