X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=895debbc01a83515345979683eec4401ec62dccd;hb=d4e30bfef1ac602f80dcaf9c3dc0934a57be5de2;hp=08d36a4ba90cb10a5a0c391394bd482585e9e2b6;hpb=115086e2c392e3b5cb2c6510b25a530520b435da;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 08d36a4b..895debbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,13 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4 --install -Wall -Werror
+ACLOCAL_AMFLAGS= -I m4 -I libtest/m4
+AM_YFLAGS= -d
 
 # includes append to these:
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -17,52 +19,75 @@ noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_LTLIBRARIES=
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
+dist_man_MANS=
+MAINTAINERCLEANFILES=
 
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
 DISTCLEANFILES+= aminclude.am
 
-EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
-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 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 poll/include.am
-include rpm.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
 
 include m4/include.am
+endif
 
+TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
-EXTRA_DIST+= ${man_MANS}
+if ! BUILD_WIN32
 
 merge-clean:
 	@find ./ | $(GREP) \.gcda | xargs rm -f
@@ -71,7 +96,6 @@ merge-clean:
 	@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
@@ -79,8 +103,8 @@ merge-clean:
 	@echo "Files that need to be either removed or checked in:"
 	@bzr unknowns
 
-clean-local:
-	-rm -rf docs/_build docs/doctrees
+clean-local: clean-libtest-check clean-docs-check clean-rpm
+
 
 lcov: lcov-clean check
 	@echo
@@ -95,9 +119,37 @@ lcov-clean: clean
 	@rm -rf lcov */lcov.out
 	@find . -name '*.gcno' | xargs rm -f
 	@find . -name '*.gcda' | xargs rm -f
+endif
 
 DISTCLEANFILES+= config/top.h
 
-install-website: html-local
-	@rm -r -f /var/www/libmemcached/*
-	@cp -r docs/html /var/www/libmemcached
+maintainer-clean-local:
+	find . -type f -name '*~' -exec rm -f '{}' \;
+	-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/test-driver
+	-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
+	-rm -f m4/test-driver
+	-rmdir build-aux
+	-rm -rf ${top_builddir}/html
+	-rm -f $(DIST_ARCHIVES)