Clean up SOCK_NONBLOCK

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d4089ffdf665722bc3229aec38973864b8ba53cf..5b1fcd21ebe3ff6a7614a96a4df0bf0f4b445b64 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,9 @@ EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
 EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
-EXTRA_DIST+= config/autorun.sh
-EXTRA_DIST+= config/pandora-plugin
-EXTRA_DIST+= config/uncrustify.cfg
+
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
 
 include libtest/include.am
 
@@ -38,6 +38,7 @@ include libmemcachedutil-1.0/include.am
 
 include clients/include.am
 include docs/include.am
+include man/include.am
 include example/include.am
 include libhashkit/include.am
 include libmemcached/include.am
@@ -52,12 +53,7 @@ include tests/include.am
 include util/include.am
 include win32/include.am
 
-if HAVE_LIBEVENT
-include memcached/include.am
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-endif
-
-docs: html man
+include m4/include.am
 
 TESTS += ${check_PROGRAMS}
 
@@ -67,9 +63,10 @@ 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
-       @rm *\.rpm
+       @rm -f *\.rpm
        @find ./ | $(GREP) \.THIS | xargs rm -f
        @find ./ | $(GREP) \.OTHER | xargs rm -f
        @find ./ | $(GREP) \.BASE | xargs rm -f
@@ -95,3 +92,7 @@ lcov-clean: clean
        @find . -name '*.gcda' | xargs rm -f
 
 DISTCLEANFILES+= config/top.h
+
+install-website: html-local
+       @rm -r -f /var/www/libmemcached/*
+       @cp -r docs/html /var/www/libmemcached