X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=c6b23a43cfc23626799c154045b9d4b12e6e821d;hb=99da3be819c5e34934789eed92b15d89f7cf0f65;hp=cfeb34f4d9ec5147b9908fd8b15173752551b4da;hpb=804f22a1c1024cdd27cc477e0a51fc46e7451a9f;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index cfeb34f4..c6b23a43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,14 @@ 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
@@ -47,7 +53,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
@@ -57,8 +63,6 @@ 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
@@ -93,6 +97,36 @@ lcov-clean: clean
 
 DISTCLEANFILES+= config/top.h
 
-install-html: html-local
+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