Merge in old and new memslap.

[m6w6/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 079f9482c6912d33cdb85f76b4b62cecfbd335ad..a7bf2cc6af8ffee2544789bb1acaca9faa12e795 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,12 @@ nobase_include_HEADERS =
 check_PROGRAMS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
+DISTCLEANFILES=
 EXTRA_DIST= \
            ${srcdir}/m4/pandora_*.m4 \
            .quickly \
            README.FIRST \
+           README.win32 \
            config/autorun.sh \
            config/pandora-plugin \
            config/uncrustify.cfg \
@@ -40,8 +42,8 @@ test-docs:
        (cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
+include libtest/include.am
 include libhashkit/include.am
-include unittests/include.am
 include tests/include.am
 include example/include.am
 include support/include.am
@@ -93,5 +95,6 @@ lcov-clean: clean
        find . -name '*.gcno' | xargs rm -f
        find . -name '*.gcda' | xargs rm -f
 
+CLEANFILES+= config/top.h