X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4d9d0531ddcaaf26e96bc576b41ec99af211c046;hb=5aa178162af4134264e1c1e794e8b196bdd0d802;hp=7bbac703b0b9eefa9d51420c4f13b19a281a2f0e;hpb=05768496dca9b3648464616a808848490131e753;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 7bbac703..4d9d0531 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,62 +1,109 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
 CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-EXTRA_DIST = README.FIRST
+EXTRA_DIST=
 
-SUBDIRS = docs
+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
+
+include libtest/include.am
+
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+
+include libhashkit-1.0/include.am
+include libmemcached-1.0/include.am
+include libmemcachedprotocol-0.0/include.am
+include libmemcachedutil-1.0/include.am
 
-test-docs:
-	(cd docs && $(MAKE) test-docs)
-include libmemcached/include.am
 include clients/include.am
-include libhashkit/include.am
-include tests/include.am
+include docs/include.am
 include example/include.am
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
+include libmemcachedinternal/include.am
+include libmemcachedinternal/util/include.am
+include poll/include.am
 include support/include.am
+include tests/include.am
+include util/include.am
+include win32/include.am
+include memcached/include.am
+
+docs: html man
 
-check-local: test-no-outputdiff
+TESTS += ${check_PROGRAMS}
 
+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 .
-
-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 .
-
-rpm: all dist generic 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 .
+
+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: 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
 
 lcov: lcov-clean check
 	@echo
@@ -64,13 +111,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
-
-
+	@rm -rf lcov */lcov.out
+	@find . -name '*.gcno' | xargs rm -f
+	@find . -name '*.gcda' | xargs rm -f
 
+DISTCLEANFILES+= config/top.h