X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b47dfc827666bad98a2782c0e2b78c2805a1455c;hb=7c8b8a571a25e21046d00cd2ef7897504a5ef939;hp=80b2c03eaf130b9b3d84725f0bcb0c028d5c3215;hpb=3b59a154e949a78ee379b0dbd6e91d91f2c3a385;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 80b2c03e..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 =
@@ -35,46 +35,65 @@ EXTRA_DIST= \
 
 include libtest/include.am
 include libmemcached/include.am
+include libmemcached/protocol/include.am
+include libmemcached/util/include.am
 include clients/include.am
 include libhashkit/include.am
 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
-	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	rpmbuild -ba support/libmemcached.spec
-	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+	@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
+	@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
+	@rpmbuild -ba support/libmemcached.spec
+	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-generic:
-	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	rpmbuild -ba support/libmemcached.spec
-	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+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/
+	@rpmbuild -ba support/libmemcached.spec
+	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all man dist generic fedora
+rpm: man distcheck generic
+
+release: rpm
+	@rpm --addsign libmemcached-$(VERSION)*.rpm .
+	@rpm --checksig libmemcached-$(VERSION)*.rpm .
+	@rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
+	@rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
+	@rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
+	@rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
 
 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) \.rej | xargs rm -f
-	find ./ | $(GREP) \.rpm | xargs rm -f
-	find ./ | $(GREP) \~$$ | xargs rm -f
-	bzr unknowns
+	@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) \.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
 
 clean-local:
 	-rm -rf docs/_build docs/doctrees
@@ -85,14 +104,12 @@ lcov: lcov-clean check
 	@echo "Make sure ./configure was run with '--enable-coverage'"
 	@echo "------------------------------------------------------"
 	@echo
-	cd libmemcached && lcov --capture --directory . --base-directory .. --output-file lcov.out
-	genhtml -o lcov --function-coverage -t libmemcached libmemcached/lcov.out
+	@cd libmemcached && lcov --capture --directory . --base-directory .. --output-file lcov.out
+	@genhtml -o lcov --function-coverage -t libmemcached libmemcached/lcov.out
 
 lcov-clean: clean
-	rm -rf lcov */lcov.out
-	find . -name '*.gcno' | xargs rm -f
-	find . -name '*.gcda' | xargs rm -f
-
-CLEANFILES+= config/top.h
-
+	@rm -rf lcov */lcov.out
+	@find . -name '*.gcno' | xargs rm -f
+	@find . -name '*.gcda' | xargs rm -f
 
+DISTCLEANFILES+= config/top.h