X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=fa4bf7260f4b29c6bc17a422601790737fdd84a9;hb=303f0aafd224cdb5d27c717661c34eaf1eaf4cae;hp=79b4cc7ae70ea59b7b77c80ed1054826f46ced13;hpb=a56e26d1e492bda3bf3c789a9391ae5b73f500cb;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 79b4cc7a..fa4bf726 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
+# vim:ft=automake
+
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
@@ -17,64 +19,61 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-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
+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
 
 include libtest/include.am
-include libmemcached/include.am
+
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+
+include libhashkit-1.0/include.am
+include libmemcached-1.0/include.am
+include libmemcachedprotocol-0.0/include.am
+include libmemcachedutil-1.0/include.am
+
 include clients/include.am
-include libhashkit/include.am
-include tests/include.am
+include docs/include.am
 include example/include.am
-include support/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
-include docs/include.am
-
-TESTS += ${check_PROGRAMS}
-EXTRA_DIST+= ${man_MANS}
+include memcached/include.am
 
+docs: html man
 
-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 .
-
-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) \.orig | xargs rm -f
+	@find ./ | $(GREP) \.rej | xargs rm -f
+	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@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
@@ -85,14 +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
-
-CLEANFILES+= config/top.h
-
+	@rm -rf lcov */lcov.out
+	@find . -name '*.gcno' | xargs rm -f
+	@find . -name '*.gcda' | xargs rm -f
 
+DISTCLEANFILES+= config/top.h