X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=6aa50af828b6dec8e3734975648dc4daf68195db;hb=a715b9a10e64a190ed868bb79ccd78f4f0d6a7f7;hp=aaebd1c32dca13a39cfe2a317abb039b66779462;hpb=27bed94f9adf2d67670daf8a237be68f5bb7a076;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index aaebd1c3..6aa50af8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,12 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4 -I libtest/m4 --install -Wall -Werror
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
 .PHONY =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -20,11 +21,14 @@ check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
+dist_man_MANS=
+MAINTAINERCLEANFILES=
 
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
-EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
+DISTCLEANFILES+= aminclude.am
+
 EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
@@ -32,35 +36,55 @@ 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.am
 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}
-
-EXTRA_DIST+= ${man_MANS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
 merge-clean:
 	@find ./ | $(GREP) \.gcda | xargs rm -f
@@ -96,6 +120,33 @@ lcov-clean: clean
 
 DISTCLEANFILES+= config/top.h
 
-install-website: html-local
-	@rm -r -f /var/www/libmemcached/*
-	@cp -r docs/html /var/www/libmemcached
+clean-local: clean-libtest-check clean-docs-check
+
+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 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