X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b0babecaacf8e0be4246944fa29df188b30d7254;hb=c625134668213eff97a837da54daec4425710d67;hp=0e6f5db29967fea90abc50b148433404b6e33fa5;hpb=4db614a7b66e3a293b484f8d853b4f5892d2d1d8;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 0e6f5db2..b0babeca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,13 +54,6 @@ include win32/include.am
 
 include m4/include.am
 
-if HAVE_LIBEVENT
-include memcached/include.am
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-endif
-
-docs: html man
-
 TESTS += ${check_PROGRAMS}
 
 EXTRA_DIST+= ${man_MANS}
@@ -70,7 +63,7 @@ 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 -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f