X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=e8a4121c8a08dd0ff3038f1891c52f4102836f95;hb=d61d9f95bb372c0691ece9632382c62c7b3c1b46;hp=a359ac00d229e52e17889078206e76b86a410afd;hpb=cb3ca2b63f9ddb2e070814623a3965c88a84eea7;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index a359ac00..e8a4121c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
@@ -18,18 +19,22 @@ noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_LTLIBRARIES=
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
 dist_man_MANS=
 MAINTAINERCLEANFILES=
 
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
 DISTCLEANFILES+= aminclude.am
 
-EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
 
@@ -56,7 +61,7 @@ endif
 include libmemcachedutil-1.0/include.am
 
 include clients/include.am
-include docs/include.am
+
 include man/include.am
 
 if BUILD_LIBMEMCACHED_PROTOCOL
@@ -73,7 +78,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -95,7 +100,6 @@ merge-clean:
 	@find ./ | $(GREP) \.moved | xargs rm -r -f
 	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f
@@ -103,7 +107,7 @@ merge-clean:
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns
 
-clean-local: clean-libtest-check clean-docs-check
+clean-local: clean-libtest-check clean-rpm
 
 
 lcov: lcov-clean check
@@ -125,12 +129,7 @@ DISTCLEANFILES+= config/top.h
 
 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) $(dist_man_MANS)
 	-rm -f Makefile.in
 	-rm -f aclocal.m4
 	-rm -f build-aux/compile
@@ -140,6 +139,8 @@ maintainer-clean-local:
 	-rm -f build-aux/install-sh
 	-rm -f build-aux/ltmain.sh
 	-rm -f build-aux/missing
+	-rm -f build-aux/test-driver
+	-rm -f build-aux/ylwrap
 	-rm -f mem_config.in
 	-rm -f config.log
 	-rm -f config.status
@@ -149,5 +150,7 @@ maintainer-clean-local:
 	-rm -f m4/ltsugar.m4
 	-rm -f m4/ltversion.m4
 	-rm -f m4/lt~obsolete.m4
+	-rm -f m4/test-driver
 	-rmdir build-aux
 	-rm -rf ${top_builddir}/html
+	-rm -f $(DIST_ARCHIVES)