Fix for interface issues (Bug 571909 <571909@bugs.launchpad.net>)

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0bfe7ccd453ebf58d314185d90daa70a7d2ce3e9..d2acebaa4658258582dd8e4b712c90d91b5223f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,22 +4,39 @@ ACLOCAL_AMFLAGS = -I m4
 SUFFIXES =
 PHONY =
 TESTS =
-CLEANFILES = 
+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
+EXTRA_DIST= \
+           ${srcdir}/m4/pandora_*.m4 \
+           .quickly \
+           README.FIRST \
+           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
+
 
 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
@@ -30,7 +47,7 @@ check-local: 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 .
@@ -38,7 +55,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 .
@@ -46,8 +63,28 @@ generic:
 rpm: all 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
 
+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
+
+
+