projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update from ddm4
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e64231fe030ce35f3f2797b7c93592738bee31bd..5b1fcd21ebe3ff6a7614a96a4df0bf0f4b445b64 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-25,9
+25,9
@@
EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
EXTRA_DIST+= .quickly
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
EXTRA_DIST+= .quickly
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
-EXTRA_DIST+= config/autorun.sh
-EXTRA_DIST+= config/pandora-plugin
-EXTRA_DIST+= config/uncrustify.cfg
+
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
include libtest/include.am
include libtest/include.am
@@
-38,6
+38,7
@@
include libmemcachedutil-1.0/include.am
include clients/include.am
include docs/include.am
include clients/include.am
include docs/include.am
+include man/include.am
include example/include.am
include libhashkit/include.am
include libmemcached/include.am
include example/include.am
include libhashkit/include.am
include libmemcached/include.am
@@
-54,13
+55,6
@@
include win32/include.am
include m4/include.am
include m4/include.am
-if HAVE_LIBEVENT
-include memcached/include.am
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-endif
-
-docs: html man
-
TESTS += ${check_PROGRAMS}
EXTRA_DIST+= ${man_MANS}
TESTS += ${check_PROGRAMS}
EXTRA_DIST+= ${man_MANS}
@@
-98,3
+92,7
@@
lcov-clean: clean
@find . -name '*.gcda' | xargs rm -f
DISTCLEANFILES+= config/top.h
@find . -name '*.gcda' | xargs rm -f
DISTCLEANFILES+= config/top.h
+
+install-website: html-local
+ @rm -r -f /var/www/libmemcached/*
+ @cp -r docs/html /var/www/libmemcached