X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=6a851b5036b5b11249b611ca959fb7175f837786;hb=906af4a393ba612a97230cf7c783aa8301c54914;hp=baecaf4e327b4dd62a85e010f5d4c5f6a1ec1c2b;hpb=f0a568f40ab283bb0be08bd0d930c70386418b97;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index baecaf4e..6a851b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,13 @@
-ACLOCAL_AMFLAGS = -I m4
+# vim:ft=automake
+
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
-PHONY =
+.PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -17,66 +21,91 @@ 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=
+dist_man_MANS=
+MAINTAINERCLEANFILES=
 
-include libtest/include.am
+#includes additional rules from aminclude.am
+@INC_AMINCLUDE@
+
+DISTCLEANFILES+= aminclude.am
+
+EXTRA_DIST+= .quickly
+EXTRA_DIST+= README.FIRST
+EXTRA_DIST+= README.win32
+
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
+
+# Build targets for Windows
+if BUILD_WIN32
+include libhashkit-1.0/include.am
+include libhashkit/include.am
 include libmemcached/include.am
+include libmemcached-1.0/include.am
+else
+
+include libtest/include.am
+
+include libhashkit-1.0/include.am
+include libmemcached-1.0/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
+include libmemcachedprotocol-0.0/include.am
+endif
+
+include libmemcachedutil-1.0/include.am
+
 include clients/include.am
-include libhashkit/include.am
-include tests/include.am
+include docs/include.am
+include man/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
 include example/include.am
+endif
+
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcachedutil/include.am
+
+if BUILD_LIBMEMCACHED_PROTOCOL
+include libmemcachedprotocol/include.am
+endif
+
+include libmemcachedinternal/include.am
+include libmemcachedinternal/util/include.am
+include rpm/include.am
 include support/include.am
-include poll/include.am
+include tests/include.am
+include util/include.am
 include win32/include.am
-include docs/include.am
 
-TESTS += ${check_PROGRAMS}
+include m4/include.am
+endif
 
+TESTS += ${bin_PROGRAMS}
+TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
-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 .
+if ! BUILD_WIN32
 
-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 .
+merge-clean:
+	@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
 
-rpm: all dist generic fedora
+clean-local: clean-libtest-check clean-docs-check
 
-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
-
-clean-local:
-	-rm -rf docs/_build docs/doctrees
 
 lcov: lcov-clean check
 	@echo
@@ -84,14 +113,43 @@ 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
+endif
 
+DISTCLEANFILES+= config/top.h
 
+maintainer-clean-local:
+	find . -type f -name '*~' -exec rm -f '{}' \;
+	-rm -f @PACKAGE@-*.rpm
+	-rm -f @PACKAGE@-*.tar.gz
+	-rm -f man/*.1
+	-rm -f man/*.3
+	-rm -f man/*.8
+	-rm -rf man/.doctrees/
+	-rm -f Makefile.in
+	-rm -f aclocal.m4
+	-rm -f build-aux/compile
+	-rm -f build-aux/config.guess
+	-rm -f build-aux/config.sub
+	-rm -f build-aux/depcomp
+	-rm -f build-aux/install-sh
+	-rm -f build-aux/ltmain.sh
+	-rm -f build-aux/missing
+	-rm -f build-aux/ylwrap
+	-rm -f mem_config.in
+	-rm -f config.log
+	-rm -f config.status
+	-rm -f configure
+	-rm -f m4/libtool.m4
+	-rm -f m4/ltoptions.m4
+	-rm -f m4/ltsugar.m4
+	-rm -f m4/ltversion.m4
+	-rm -f m4/lt~obsolete.m4
+	-rmdir build-aux
+	-rm -rf ${top_builddir}/html