c++: fix C++11 compatibility

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d001031047c8c09b3b6963d943f8094b6e4c9539..e8a4121c8a08dd0ff3038f1891c52f4102836f95 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,10 @@ EXTRA_DIST=
 dist_man_MANS=
 MAINTAINERCLEANFILES=
 
+if IS_VCS_CHECKOUT
+SUBDIRS= docs
+endif
+
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 
@@ -57,7 +61,7 @@ endif
 include libmemcachedutil-1.0/include.am
 
 include clients/include.am
-include docs/include.am
+
 include man/include.am
 
 if BUILD_LIBMEMCACHED_PROTOCOL
@@ -74,7 +78,7 @@ endif
 
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include rpm/include.am
+include rpm/include.mk
 include support/include.am
 include tests/include.am
 include util/include.am
@@ -96,7 +100,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
@@ -104,7 +107,7 @@ merge-clean:
        @echo "Files that need to be either removed or checked in:"
        @bzr unknowns
 
-clean-local: clean-libtest-check clean-docs-check clean-rpm
+clean-local: clean-libtest-check clean-rpm
 
 
 lcov: lcov-clean check
@@ -126,10 +129,7 @@ DISTCLEANFILES+= config/top.h
 
 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) $(dist_man_MANS)
        -rm -f Makefile.in
        -rm -f aclocal.m4
        -rm -f build-aux/compile