From: Brian Aker <brian@tangent.org>
Date: Tue, 22 Feb 2011 02:09:08 +0000 (-0800)
Subject: Merge in dist fix from Monty
X-Git-Tag: 0.51~34
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4209d822c35fea2ca1c5879e18bc6c063dba4c41;hp=-c;p=m6w6%2Flibmemcached

Merge in dist fix from Monty
---

4209d822c35fea2ca1c5879e18bc6c063dba4c41
diff --combined Makefile.am
index df606e61,7111bceb..7b866d0c
--- a/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 27a7bf51,e6c5367f..b90a5ef7
--- a/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)