Merging bzr://gaz.tangent.org/libmemcached/build2/ to Build branch

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f033421ad07b8955ba651647ce7d8e3618676796..4d9d0531ddcaaf26e96bc576b41ec99af211c046 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,17 +19,20 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
-EXTRA_DIST= \
-           ${srcdir}/m4/pandora_*.m4 \
-           .quickly \
-           README.FIRST \
-           README.win32 \
-           config/autorun.sh \
-           config/pandora-plugin \
-           config/uncrustify.cfg
+EXTRA_DIST=
+
+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
 
 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
@@ -49,6 +52,7 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+include memcached/include.am
 
 docs: html man