Merge in dist fix from Monty

diff --combined Makefile.am
index df606e6171ed2e30e184494bbc53f1d4e578778f,7111bceb2160ee40278f383ffb1711d2c3e4f960..7b866d0c67b0f185c2e4481415309c516a9bb101
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -19,6 -19,7 +19,7 @@@ EXTRA_DIST= 
            ${srcdir}/m4/pandora_*.m4 \
            .quickly \
            README.FIRST \
+           README.win32 \
            config/autorun.sh \
            config/pandora-plugin \
            config/uncrustify.cfg \
@@@ -93,6 -94,5 +94,6 @@@ lcov-clean: clea
        find . -name '*.gcno' | xargs rm -f
        find . -name '*.gcda' | xargs rm -f
  
 +CLEANFILES+= config/top.h
  
  

diff --combined tests/include.am
index 27a7bf5164b42426f93db263ead3d9c918751479,e6c5367f23c750e5a7be951e995a60300fae2952..b90a5ef7d9f8559f33b833ecdf3bbe0697c7be02
--- 1/tests/include.am
--- 2/tests/include.am
+++ b/tests/include.am
@@@ -14,6 -14,10 +14,10 @@@ if BUILD_LIBMEMCACHEDUTI
  TESTS_LDADDS+= libmemcached/libmemcachedutil.la
  endif
  
+ EXTRA_DIST+= \
+            tests/cpp_example.cc \
+            tests/output_plus.res
+ 
  noinst_HEADERS+= \
                 tests/hash_results.h \
                 tests/ketama_test_cases.h \
@@@ -47,11 -51,7 +51,11 @@@ tests_testapp_DEPENDENCIES= 
                            tests/libtest.la \
                            libmemcached/libmemcachedinternal.la \
                            $(TESTS_LDADDS)
 -tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
 +tests_testapp_LDADD= clients/libgenexec.la \
 +                   tests/libserver.la \
 +                   tests/libtest.la \
 +                   libmemcached/libmemcachedinternal.la \
 +                   $(TESTS_LDADDS) $(LIBSASL)
  
  tests_testplus_SOURCES= tests/plus.cpp
  tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)