X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4394dec47fa2009b9aacdb0636a9a1d944cf28c8;hb=35811e5efa56436f7f0e03c68bc8cf78f2b2c1c4;hp=a548c9823be72f5bf9934a332cb0399c2444529e;hpb=38d70dfdb082834652ff8823ad7f35067e720b1a;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index a548c982..4394dec4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,10 +52,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
+include m4/include.am
 
 docs: html man
 
@@ -67,9 +64,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