Update for version 1.0.13

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a548c9823be72f5bf9934a332cb0399c2444529e..c6b23a43cfc23626799c154045b9d4b12e6e821d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,14 +20,20 @@ check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
+dist_man_MANS=
+MAINTAINERCLEANFILES=
+
+#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 +44,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,30 +53,24 @@ 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
 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}
 
-EXTRA_DIST+= ${man_MANS}
-
 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
@@ -95,3 +96,37 @@ lcov-clean: clean
        @find . -name '*.gcda' | xargs rm -f
 
 DISTCLEANFILES+= config/top.h
+
+clean-local: clean-libtest-check clean-docs-check
+
+maintainer-clean-local:
+       find . -type f -name '*~' -exec rm -f '{}' \;
+       -rm -f @PACKAGE@-*.rpm
+       -rm -f @PACKAGE@-*.tar.gz
+       -rm -f man/*.1
+       -rm -f man/*.3
+       -rm -f man/*.8
+       -rm -rf man/.doctrees/
+       -rm -f Makefile.in
+       -rm -f aclocal.m4
+       -rm -f build-aux/compile
+       -rm -f build-aux/config.guess
+       -rm -f build-aux/config.sub
+       -rm -f build-aux/depcomp
+       -rm -f build-aux/install-sh
+       -rm -f build-aux/ltmain.sh
+       -rm -f build-aux/missing
+       -rm -f config.in
+       -rm -f config.log
+       -rm -f config.status
+       -rm -f configure
+       -rm -f m4/libtool.m4
+       -rm -f m4/ltoptions.m4
+       -rm -f m4/ltsugar.m4
+       -rm -f m4/ltversion.m4
+       -rm -f m4/lt~obsolete.m4
+       -rmdir build-aux
+
+install-website: html-local
+       @rm -r -f /var/www/libmemcached/*
+       @cp -r docs/html /var/www/libmemcached