projects
/
awesomized
/
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-183
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index c6b23a43cfc23626799c154045b9d4b12e6e821d..f5c63863b8565d7e7a31c207ea0da315ad4c928e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-39,17
+39,29
@@
include libtest/include.am
include libhashkit-1.0/include.am
include libmemcached-1.0/include.am
include libhashkit-1.0/include.am
include libmemcached-1.0/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
include libmemcachedprotocol-0.0/include.am
include libmemcachedprotocol-0.0/include.am
+endif
+
include libmemcachedutil-1.0/include.am
include clients/include.am
include docs/include.am
include man/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 example/include.am
include example/include.am
+endif
+
include libhashkit/include.am
include libmemcached/include.am
include libmemcachedutil/include.am
include libhashkit/include.am
include libmemcached/include.am
include libmemcachedutil/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
include libmemcachedprotocol/include.am
include libmemcachedprotocol/include.am
+endif
+
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
include poll/include.am
include libmemcachedinternal/include.am
include libmemcachedinternal/util/include.am
include poll/include.am
@@
-116,7
+128,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 config.in
+ -rm -f
mem_
config.in
-rm -f config.log
-rm -f config.status
-rm -f configure
-rm -f config.log
-rm -f config.status
-rm -f configure
@@
-126,7
+138,4
@@
maintainer-clean-local:
-rm -f m4/ltversion.m4
-rm -f m4/lt~obsolete.m4
-rmdir build-aux
-rm -f m4/ltversion.m4
-rm -f m4/lt~obsolete.m4
-rmdir build-aux
-
-install-website: html-local
- @rm -r -f /var/www/libmemcached/*
- @cp -r docs/html /var/www/libmemcached
+ -rm -rf ${top_builddir}/html