X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=263ae32d755138bad6f7594eb29fe0df7f8b057c;hb=ed60da56bcd4780cd616e76dea9a9886acc2ae95;hp=1326e2eb38aabfb6f17a846bc1ef0f216e916cca;hpb=363ba89b6954d2cdcc20f738b627499695e4aaf4;p=awesomized%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 1326e2eb..263ae32d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,9 @@ EXTRA_DIST+= ${srcdir}/m4/pandora_*.m4
 EXTRA_DIST+= .quickly
 EXTRA_DIST+= README.FIRST
 EXTRA_DIST+= README.win32
-EXTRA_DIST+= config/autorun.sh
-EXTRA_DIST+= config/pandora-plugin
-EXTRA_DIST+= config/uncrustify.cfg
+
+aclocaldir= $(datadir)/aclocal
+dist_aclocal_DATA=
 
 include libtest/include.am
 
@@ -38,6 +38,7 @@ include libmemcachedutil-1.0/include.am
 
 include clients/include.am
 include docs/include.am
+include man/include.am
 include example/include.am
 include libhashkit/include.am
 include libmemcached/include.am
@@ -52,12 +53,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
-
-docs: html man
+include m4/include.am
 
 TESTS += ${check_PROGRAMS}
 
@@ -68,7 +64,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