Merge in util/libtest update

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b47dfc827666bad98a2782c0e2b78c2805a1455c..2ecc8f2c1c175b46daf551b4b4a8aecab11cc789 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,28 +24,25 @@ 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 libmemcached/include.am
-include libmemcached/protocol/include.am
-include libmemcached/util/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 libmemcached/util/include.am
+include libmemcached/protocol/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 docs/include.am
 
 docs: html man