X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=b0babecaacf8e0be4246944fa29df188b30d7254;hb=5a6dd35a036e60a1e51d2bffbde6b5fb0064e65d;hp=fa4bf7260f4b29c6bc17a422601790737fdd84a9;hpb=25efe3485198149616820ab4e52d2f18f0abe5a7;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index fa4bf726..b0babeca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,6 @@ EXTRA_DIST+= config/uncrustify.cfg
 
 include libtest/include.am
 
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
 include libmemcachedprotocol-0.0/include.am
@@ -53,9 +51,8 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
-include memcached/include.am
 
-docs: html man
+include m4/include.am
 
 TESTS += ${check_PROGRAMS}
 
@@ -65,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
-	@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