X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4394dec47fa2009b9aacdb0636a9a1d944cf28c8;hb=f154f10002fe127f9defcf5f70f9654c2816b965;hp=6581b2aa0cd6dd52ef21610b73a7aa2f9ac8252b;hpb=0250c4dd47495fceda6cede571a3b7b68b2b9fb7;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 6581b2aa..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
 
@@ -68,9 +65,9 @@ merge-clean:
 	@find ./ | $(GREP) \.gcno | xargs rm -f
 	@find ./ | $(GREP) \.gz | xargs rm -f
 	@find ./ | $(GREP) \.moved | xargs rm -r -f
-	@find ./ | $(GREP) \.orig | xargs rm -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