X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4d94c2fc2267fd9667a92c12ef8703dd16114e98;hb=556d9cca3738f2dcecbe0cda93ba9dd89d1a7a31;hp=8a95b8c260d5821bdc4711848e14fa0597556299;hpb=fee8381b6b80398fcb6893860400ead6a598f15b;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 8a95b8c2..4d94c2fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
@@ -26,26 +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-1.0/include.am
-include libhashkit-1.0/include.am
-include libmemcachedprotocol-0.0/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