Additional flex warning issues.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa4bf7260f4b29c6bc17a422601790737fdd84a9..4394dec47fa2009b9aacdb0636a9a1d944cf28c8 100644 (file)
--- 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,7 +51,8 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
-include memcached/include.am
+
+include m4/include.am
 
 docs: html man
 
@@ -65,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