X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=4d94c2fc2267fd9667a92c12ef8703dd16114e98;hb=e43f018db5ff3167a060cd383f017147cebe68c2;hp=16b22797c9b1d94e97204e38593e5c4bbbcca434;hpb=3c4d734f56530d43520f385bff97162c04ac81ac;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index 16b22797..4d94c2fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,10 @@
+# vim:ft=automake
+
 ACLOCAL_AMFLAGS = -I m4
 
 # includes append to these:
 SUFFIXES =
 .PHONY =
-PHONY =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
@@ -25,28 +26,32 @@ EXTRA_DIST= \
 	    README.win32 \
 	    config/autorun.sh \
 	    config/pandora-plugin \
-	    config/uncrustify.cfg \
-	    m4/ac_cxx_header_stdcxx_98.m4 \
-	    m4/acx_pthread.m4  \
-	    m4/gettext.m4 \
-	    m4/iconv.m4 \
-	    m4/pkg.m4 \
-	    m4/po.m4 \
-	    m4/progtest.m4
+	    config/uncrustify.cfg
 
 include libtest/include.am
-include libmemcached/include.am
-include libmemcached/protocol/include.am
-include libmemcached/util/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 libhashkit/include.am
-include tests/include.am
+include docs/include.am
 include example/include.am
-include support/include.am
+include libhashkit/include.am
+include libmemcached/include.am
+include libmemcachedutil/include.am
+include libmemcachedprotocol/include.am
+include libmemcachedinternal/include.am
+include libmemcachedinternal/util/include.am
 include poll/include.am
+include support/include.am
+include tests/include.am
 include util/include.am
 include win32/include.am
-include docs/include.am
+include memcached/include.am
 
 docs: html man