X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b0babecaacf8e0be4246944fa29df188b30d7254;hb=f39b759b9e4483e266ee56b09e0e49a6b36170d7;hp=d4089ffdf665722bc3229aec38973864b8ba53cf;hpb=2b7069ccd04567f59ba6ed2d5b5f74c1c0d697ee;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index d4089ffd..b0babeca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,12 +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
-
-docs: html man
+include m4/include.am
 
 TESTS += ${check_PROGRAMS}
 
@@ -67,9 +62,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