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

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d19991ecd98a55fd645f07447747f2456589118c..4d94c2fc2267fd9667a92c12ef8703dd16114e98 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
@@ -26,10 +28,10 @@ EXTRA_DIST= \
            config/pandora-plugin \
            config/uncrustify.cfg
 
-libmemcached_libmemcached_la_LDFLAGS=
-
 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 +51,7 @@ include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+include memcached/include.am
 
 docs: html man