X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=77f38e5b4909ea182de0ff866992840c1bb927b9;hb=7bca10ca93172c1417f10c630a13c7aa88617ded;hp=a548c9823be72f5bf9934a332cb0399c2444529e;hpb=38d70dfdb082834652ff8823ad7f35067e720b1a;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index a548c982..77f38e5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,9 @@ 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
 
 include libhashkit-1.0/include.am
@@ -38,6 +41,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 +56,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 +66,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
-	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f