projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove dead pandora files.
[awesomized/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a548c9823be72f5bf9934a332cb0399c2444529e..08d36a4ba90cb10a5a0c391394bd482585e9e2b6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,6
+1,6
@@
# vim:ft=automake
# vim:ft=automake
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
--install -Wall -Werror
# includes append to these:
SUFFIXES =
# includes append to these:
SUFFIXES =
@@
-21,13
+21,18
@@
EXTRA_HEADERS =
BUILT_SOURCES=
EXTRA_DIST=
BUILT_SOURCES=
EXTRA_DIST=
+#includes additional rules from aminclude.am
+@INC_AMINCLUDE@
+
+DISTCLEANFILES+= aminclude.am
+
EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
EXTRA_DIST+= .quickly
EXTRA_DIST+= README.FIRST
EXTRA_DIST+= README.win32
EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
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
+43,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
@@
-52,12
+58,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
+68,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
@@
-95,3
+97,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