projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: fix return value type
[m6w6/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 6a851b5036b5b11249b611ca959fb7175f837786..789e6dcffcbb1c939eb101c794237affddb65364 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-19,18
+19,22
@@
noinst_PROGRAMS =
include_HEADERS =
nobase_include_HEADERS =
check_PROGRAMS =
include_HEADERS =
nobase_include_HEADERS =
check_PROGRAMS =
+check_LTLIBRARIES=
EXTRA_HEADERS =
BUILT_SOURCES=
EXTRA_DIST=
dist_man_MANS=
MAINTAINERCLEANFILES=
EXTRA_HEADERS =
BUILT_SOURCES=
EXTRA_DIST=
dist_man_MANS=
MAINTAINERCLEANFILES=
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
#includes additional rules from aminclude.am
@INC_AMINCLUDE@
DISTCLEANFILES+= aminclude.am
#includes additional rules from aminclude.am
@INC_AMINCLUDE@
DISTCLEANFILES+= aminclude.am
-EXTRA_DIST+= .quickly
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
@@
-57,7
+61,7
@@
endif
include libmemcachedutil-1.0/include.am
include clients/include.am
include libmemcachedutil-1.0/include.am
include clients/include.am
-include docs/include.am
+
include man/include.am
if BUILD_LIBMEMCACHED_PROTOCOL
include man/include.am
if BUILD_LIBMEMCACHED_PROTOCOL
@@
-74,7
+78,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
@@
-83,9
+87,7
@@
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
if ! BUILD_WIN32
@@
-96,7
+98,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
@@
-104,7
+105,7
@@
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: clean-libtest-check clean-
docs-check
+clean-local: clean-libtest-check clean-
rpm
lcov: lcov-clean check
lcov: lcov-clean check
@@
-126,12
+127,7
@@
DISTCLEANFILES+= config/top.h
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 -rf man/.doctrees/
+ -$(RM) $(dist_man_MANS)
-rm -f Makefile.in
-rm -f aclocal.m4
-rm -f build-aux/compile
-rm -f Makefile.in
-rm -f aclocal.m4
-rm -f build-aux/compile
@@
-141,6
+137,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/test-driver
-rm -f build-aux/ylwrap
-rm -f mem_config.in
-rm -f config.log
-rm -f build-aux/ylwrap
-rm -f mem_config.in
-rm -f config.log
@@
-151,5
+148,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)