X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=2c2760160a862144f2541861679a0054adaafcd9;hb=cb9cdd2652b441d362fdcbd3f185652f941d3108;hp=2533593b1f344b235d4752ef50c788076d98c929;hpb=c801828a5a8937eeb9c008135185a6b5ab6199a9;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 2533593b..2c276016 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,44 +4,56 @@ ACLOCAL_AMFLAGS = -I m4
 SUFFIXES =
 PHONY =
 TESTS =
-CLEANFILES = 
+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
+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/
+	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 .
@@ -49,18 +61,38 @@ fedora:
 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/
+	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
+rpm: all man dist generic fedora
 
 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
 
-hudson-valgrind: all
-	@(cd tests; ${MAKE} hudson-valgrind)
+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
+
+DISTCLEANFILES+= config/top.h