Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-65

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0babecaacf8e0be4246944fa29df188b30d7254..cc6bc018054cc03788addf235a84b34aafc1c057 100644 (file)
--- 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,18 @@ EXTRA_HEADERS =
 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+= 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 +43,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
@@ -46,7 +52,7 @@ include libmemcachedprotocol/include.am
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
 include poll/include.am
-include rpm.am
+include rpm/include.am
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -91,3 +97,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