X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=Makefile.am;h=99687ed6e7a84dd2cf387e63f19496fb643592e8;hb=54915965dc90f7aeceda9e9b1370c77eb8b1631f;hp=5dd028a7555cba0f075b4da96604414ec990ea6a;hpb=ab1cac43b7d6b8401ec0c196ed6bbab84e7c1a49;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 5dd028a7..99687ed6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,41 +2,38 @@ ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
+PHONY =
 TESTS =
+CLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
-pkginclude_HEADERS =
-nobase_pkginclude_HEADERS =
+include_HEADERS =
+nobase_include_HEADERS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST
 
-SUBDIRS = . docs support tests example 
+SUBDIRS = docs
 
+test-docs:
+	(cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
+include libhashkit/include.am
+include tests/include.am
+include example/include.am
+include support/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)
-
-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 .
@@ -44,7 +41,7 @@ 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 .
@@ -57,5 +54,19 @@ merge-clean:
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
 
-hudson-valgrind: all
-	@(cd tests; ${MAKE} hudson-valgrind)
+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
+
+
+