X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=5b1fcd21ebe3ff6a7614a96a4df0bf0f4b445b64;hb=5cac64189701682ebc7c89f4daaddc426fc5073e;hp=fa4bf7260f4b29c6bc17a422601790737fdd84a9;hpb=25efe3485198149616820ab4e52d2f18f0abe5a7;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index fa4bf726..5b1fcd21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,13 +25,11 @@ 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
 
-include libtest/include.am
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
 
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+include libtest/include.am
 
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
@@ -40,6 +38,7 @@ include libmemcachedutil-1.0/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
@@ -53,9 +52,8 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
-include memcached/include.am
 
-docs: html man
+include m4/include.am
 
 TESTS += ${check_PROGRAMS}
 
@@ -65,9 +63,10 @@ merge-clean:
 	@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) \.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
@@ -93,3 +92,7 @@ lcov-clean: clean
 	@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