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

diff --git a/Makefile.am b/Makefile.am
index 5dd028a7..2c7f15ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,60 +2,108 @@ ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
+PHONY =
 TESTS =
+CLEANFILES =
+DISTCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+man_MANS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
-pkginclude_HEADERS =
-nobase_pkginclude_HEADERS =
+include_HEADERS =
+nobase_include_HEADERS =
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-EXTRA_DIST = README.FIRST
-
-SUBDIRS = . docs support tests example 
+EXTRA_DIST= \
+	    ${srcdir}/m4/pandora_*.m4 \
+	    .quickly \
+	    README.FIRST \
+	    README.win32 \
+	    config/autorun.sh \
+	    config/pandora-plugin \
+	    config/uncrustify.cfg \
+	    m4/ac_cxx_header_stdcxx_98.m4 \
+	    m4/acx_pthread.m4  \
+	    m4/gettext.m4 \
+	    m4/iconv.m4 \
+	    m4/pkg.m4 \
+	    m4/po.m4 \
+	    m4/progtest.m4
 
+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 win32/include.am
+include docs/include.am
 
-check-local: test-no-outputdiff
-
-test: all
-	@(cd tests; ${MAKE} test)
-
-test-extended: all
-	@(cd tests; ${MAKE} test-extended)
-
-valgrind: all
-	@(cd tests; ${MAKE} valgrind)
+TESTS += ${check_PROGRAMS}
+EXTRA_DIST+= ${man_MANS}
 
-test-no-outputdiff:
-	@(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
-	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	cp libmemcached-$(VERSION).tar.gz /home/brian/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 /home/brian/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/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
+	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
-rpm: all dist generic fedora
+rpm: all 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) \.orig | xargs rm -f
-	find ./ | $(GREP) \.rej | 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) \~$$ | 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
+	@echo "	------------------------------------------------------"
+	@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
+
+lcov-clean: clean
+	@rm -rf lcov */lcov.out
+	@find . -name '*.gcno' | xargs rm -f
+	@find . -name '*.gcda' | xargs rm -f
 
-hudson-valgrind: all
-	@(cd tests; ${MAKE} hudson-valgrind)
+DISTCLEANFILES+= config/top.h