Merge staging tree to 1.0 trunk.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1326e2eb38aabfb6f17a846bc1ef0f216e916cca..4394dec47fa2009b9aacdb0636a9a1d944cf28c8 100644 (file)
--- 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,7 +65,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