projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for release.
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 33d8fcaa58abd56aba6a7f72c08c36f9945c4ad6..895debbc01a83515345979683eec4401ec62dccd 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 =
@@
-17,6
+19,7
@@
noinst_PROGRAMS =
include_HEADERS =
nobase_include_HEADERS =
check_PROGRAMS =
include_HEADERS =
nobase_include_HEADERS =
check_PROGRAMS =
+check_LTLIBRARIES=
EXTRA_HEADERS =
BUILT_SOURCES=
EXTRA_DIST=
EXTRA_HEADERS =
BUILT_SOURCES=
EXTRA_DIST=
@@
-28,7
+31,6
@@
MAINTAINERCLEANFILES=
DISTCLEANFILES+= aminclude.am
DISTCLEANFILES+= aminclude.am
-EXTRA_DIST+= .quickly
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
@@
-72,7
+74,7
@@
endif
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
-include rpm/include.
am
+include rpm/include.
mk
include support/include.am
include tests/include.am
include util/include.am
include support/include.am
include tests/include.am
include util/include.am
@@
-81,7
+83,11
@@
include win32/include.am
include m4/include.am
endif
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,7
+96,6
@@
merge-clean:
@find ./ | $(GREP) \.moved | xargs rm -r -f
@find ./ | $(GREP) \\.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
@find ./ | $(GREP) \.moved | xargs rm -r -f
@find ./ | $(GREP) \\.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
- @rm -f *\.rpm
@find ./ | $(GREP) \.THIS | xargs rm -f
@find ./ | $(GREP) \.OTHER | xargs rm -f
@find ./ | $(GREP) \.BASE | xargs rm -f
@find ./ | $(GREP) \.THIS | xargs rm -f
@find ./ | $(GREP) \.OTHER | xargs rm -f
@find ./ | $(GREP) \.BASE | xargs rm -f
@@
-98,8
+103,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 clean-rpm
+
lcov: lcov-clean check
@echo
lcov: lcov-clean check
@echo
@@
-114,15
+119,12
@@
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 '{}' \;
maintainer-clean-local:
find . -type f -name '*~' -exec rm -f '{}' \;
- -rm -f @PACKAGE@-*.rpm
- -rm -f @PACKAGE@-*.tar.gz
-rm -f man/*.1
-rm -f man/*.3
-rm -f man/*.8
-rm -f man/*.1
-rm -f man/*.3
-rm -f man/*.8
@@
-136,6
+138,8
@@
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/test-driver
+ -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
@@
-145,5
+149,7
@@
maintainer-clean-local:
-rm -f m4/ltsugar.m4
-rm -f m4/ltversion.m4
-rm -f m4/lt~obsolete.m4
-rm -f m4/ltsugar.m4
-rm -f m4/ltversion.m4
-rm -f m4/lt~obsolete.m4
+ -rm -f m4/test-driver
-rmdir build-aux
-rm -rf ${top_builddir}/html
-rmdir build-aux
-rm -rf ${top_builddir}/html
+ -rm -f $(DIST_ARCHIVES)