X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4d9d0531ddcaaf26e96bc576b41ec99af211c046;hb=4018da61ccc84a5345b19b61a1cfd5a30df896ea;hp=2ecc8f2c1c175b46daf551b4b4a8aecab11cc789;hpb=94f5464bff8ac8f66b603ccccc0d4cb59ecddd01;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 2ecc8f2c..4d9d0531 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
@@ -17,32 +19,40 @@ 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
 
-libmemcached_libmemcached_la_LDFLAGS=
+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