fix wrong type of memcached_instance_st::server_timeout_counter_query_id

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b600d5a6c24b565ee7091c2e32d11b0baa3db76..e8a4121c8a08dd0ff3038f1891c52f4102836f95 100644 (file)
--- 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 =
 TESTS =
+XFAIL_TESTS =
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
@@ -15,83 +19,87 @@ noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_LTLIBRARIES=
 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
-
-libmemcached_libmemcached_la_LDFLAGS=
+EXTRA_DIST=
+dist_man_MANS=
+MAINTAINERCLEANFILES=
+
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
+#includes additional rules from aminclude.am
+@INC_AMINCLUDE@
+
+DISTCLEANFILES+= aminclude.am
+
+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 libmemcached/util/include.am
-include libmemcached/protocol/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 libtest/include.am
-include poll/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
 
-docs: html man
+include m4/include.am
+endif
 
+TESTS += ${bin_PROGRAMS}
 TESTS += ${check_PROGRAMS}
+XFAIL_TESTS += ${bin_PROGRAMS}
 
-EXTRA_DIST+= ${man_MANS}
-
-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: support/libmemcached.spec
-       @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/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
-       @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-rpm: man distcheck generic
-
-release: rpm
-       @rpm --addsign libmemcached-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
-       @rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
-       @rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
+if ! BUILD_WIN32
 
 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) \.moved | xargs rm -r -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
@@ -99,8 +107,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-rpm
+
 
 lcov: lcov-clean check
        @echo
@@ -115,5 +123,34 @@ 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
+
+maintainer-clean-local:
+       find . -type f -name '*~' -exec rm -f '{}' \;
+       -$(RM) $(dist_man_MANS)
+       -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)