Remove pandora

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cfeb34f4d9ec5147b9908fd8b15173752551b4da..1642f7c3014e1f7e69ca925a4e309924d92fd1f7 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,7 +21,11 @@ EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
 
-EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
+#includes additional rules from aminclude.am
+@INC_AMINCLUDE@
+
+DISTCLEANFILES+= aminclude.am
+
 EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
@@ -47,7 +51,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
@@ -93,6 +97,6 @@ lcov-clean: clean
 
 DISTCLEANFILES+= config/top.h
 
-install-html: html-local
+install-website: html-local
        @rm -r -f /var/www/libmemcached/*
        @cp -r docs/html /var/www/libmemcached