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

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2ecc8f2c1c175b46daf551b4b4a8aecab11cc789..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,23 +28,30 @@ 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
+include libmemcachedutil-1.0/include.am
 
 include clients/include.am
 include docs/include.am
 include example/include.am
 include libhashkit/include.am
 include libmemcached/include.am
-include libmemcached/util/include.am
-include libmemcached/protocol/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
-include libtest/include.am
 include poll/include.am
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+include memcached/include.am
 
 docs: html man