X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b47dfc827666bad98a2782c0e2b78c2805a1455c;hb=91e92172731fe8a37e562a165d25a312569aff44;hp=2c7f15efca34a5febec33d1bf16d13c9e85e5d0a;hpb=c3723b53b87471782076765f0fff656d07de74e0;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 2c7f15ef..b47dfc82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
@@ -43,12 +43,15 @@ include tests/include.am
 include example/include.am
 include support/include.am
 include poll/include.am
+include util/include.am
 include win32/include.am
 include docs/include.am
 
+docs: html man
+
 TESTS += ${check_PROGRAMS}
-EXTRA_DIST+= ${man_MANS}
 
+EXTRA_DIST+= ${man_MANS}
 
 fedora:
 	@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
@@ -58,7 +61,7 @@ fedora:
 	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
 	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-generic:
+generic: support/libmemcached.spec
 	@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
 	@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
 	@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@@ -68,7 +71,7 @@ generic:
 	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
 	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all man distcheck generic
+rpm: man distcheck generic
 
 release: rpm
 	@rpm --addsign libmemcached-$(VERSION)*.rpm .
@@ -85,6 +88,9 @@ merge-clean:
 	@find ./ | $(GREP) \.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
 	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@find ./ | $(GREP) \.THIS | xargs rm -f
+	@find ./ | $(GREP) \.OTHER | xargs rm -f
+	@find ./ | $(GREP) \.BASE | xargs rm -f
 	@find ./ | $(GREP) \~$$ | xargs rm -f
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns