Merge with build trunk

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b600d5a6c24b565ee7091c2e32d11b0baa3db76..b9e758b00a0747355e9ed05440db194f43b48999 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,27 +24,24 @@ 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
 
-libmemcached_libmemcached_la_LDFLAGS=
+include libtest/include.am
+
+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