X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=aaebd1c32dca13a39cfe2a317abb039b66779462;hb=27bed94f9adf2d67670daf8a237be68f5bb7a076;hp=6581b2aa0cd6dd52ef21610b73a7aa2f9ac8252b;hpb=0250c4dd47495fceda6cede571a3b7b68b2b9fb7;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 6581b2aa..aaebd1c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # 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 =
@@ -21,13 +21,16 @@ EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
 
+#includes additional rules from aminclude.am
+@INC_AMINCLUDE@
+
 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
 
@@ -38,6 +41,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
@@ -52,12 +56,7 @@ include tests/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}
 
@@ -68,9 +67,9 @@ merge-clean:
 	@find ./ | $(GREP) \.gcno | xargs rm -f
 	@find ./ | $(GREP) \.gz | xargs rm -f
 	@find ./ | $(GREP) \.moved | xargs rm -r -f
-	@find ./ | $(GREP) \.orig | xargs rm -f
+	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@rm *\.rpm
+	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f
@@ -96,3 +95,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