Update changelog information

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d855c8f493ba29053ac88e4af8f9605065283fea..4394dec47fa2009b9aacdb0636a9a1d944cf28c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,79 +1,82 @@
-ACLOCAL_AMFLAGS = -I m4
+# vim:ft=automake
+
+ACLOCAL_AMFLAGS = -I m4 -I libtest/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 = 
+check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-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
+EXTRA_DIST=
 
+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
 
-SUBDIRS = docs
+include libtest/include.am
+
+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 rpm.am
 include support/include.am
+include tests/include.am
+include util/include.am
+include win32/include.am
 
-TESTS += ${check_PROGRAMS}
-
-check-local: test-no-outputdiff
-
+include m4/include.am
 
-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 .
+docs: html man
 
-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 .
+TESTS += ${check_PROGRAMS}
 
-rpm: all dist generic fedora
+EXTRA_DIST+= ${man_MANS}
 
 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) \.moved | xargs rm -r -f
+       @find ./ | $(GREP) \\.orig | xargs rm -f
+       @find ./ | $(GREP) \.rej | xargs rm -f
+       @rm -f *\.rpm
+       @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
@@ -81,13 +84,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