X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=e64231fe030ce35f3f2797b7c93592738bee31bd;hb=d0bcf33155307f66b7e5a35f7934735f83665945;hp=a977a2c5fcbec6153aa9106baf212eaac471ee59;hpb=1d3ffcb8031a12f06404a0700d556901b773c409;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index a977a2c5..e64231fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
@@ -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,13 @@ include support/include.am
 include tests/include.am
 include util/include.am
 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
 
@@ -65,9 +69,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