projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-33
[m6w6/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a548c9823be72f5bf9934a332cb0399c2444529e..b0babecaacf8e0be4246944fa29df188b30d7254 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-52,12
+52,7
@@
include tests/include.am
include util/include.am
include win32/include.am
include util/include.am
include win32/include.am
-if HAVE_LIBEVENT
-include memcached/include.am
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-endif
-
-docs: html man
+include m4/include.am
TESTS += ${check_PROGRAMS}
TESTS += ${check_PROGRAMS}
@@
-67,9
+62,10
@@
merge-clean:
@find ./ | $(GREP) \.gcda | xargs rm -f
@find ./ | $(GREP) \.gcno | xargs rm -f
@find ./ | $(GREP) \.gz | xargs rm -f
@find ./ | $(GREP) \.gcda | xargs rm -f
@find ./ | $(GREP) \.gcno | xargs rm -f
@find ./ | $(GREP) \.gz | xargs rm -f
- @find ./ | $(GREP) \.orig | xargs rm -f
+ @find ./ | $(GREP) \.moved | xargs rm -r -f
+ @find ./ | $(GREP) \\.orig | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
@find ./ | $(GREP) \.rej | xargs rm -f
- @
find ./ | $(GREP) \.rpm | 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