From: Brian Aker <brian@gaz>
Date: Sun, 13 Jun 2010 16:21:08 +0000 (-0700)
Subject: Merge Monty (with formatting fixes)
X-Git-Tag: 0.41~24
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3cc0dd0ea0b37e346bbc187042c76149f2870ebf;hp=c1a8ae2ab7557b9c167e022182b810d3e2cd43ce;p=awesomized%2Flibmemcached

Merge Monty (with formatting fixes)
---

diff --git a/Makefile.am b/Makefile.am
index a410902c..d2acebaa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,19 +15,19 @@ nobase_include_HEADERS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST= \
-						${srcdir}/m4/pandora_*.m4 \
-						.quickly \
-						README.FIRST \
-						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
+	    ${srcdir}/m4/pandora_*.m4 \
+	    .quickly \
+	    README.FIRST \
+	    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
 
 
 SUBDIRS = docs
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1b02141a..398124e5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -289,45 +289,45 @@ HTML_FILES= \
 	    memstat.html
 
 POD_FILES= \
-	     hashkit_create.pod \
-	     hashkit_functions.pod \
-	     hashkit_value.pod \
-	     libmemcached.pod \
-	     libmemcached_examples.pod \
-	     libmemcachedutil.pod \
-	     memcached_analyze.pod \
-	     memcached_auto.pod \
-	     memcached_behavior.pod \
-	     memcached_callback.pod \
-	     memcached_create.pod \
-	     memcached_delete.pod \
-	     memcached_dump.pod \
-	     memcached_flush.pod \
-	     memcached_flush_buffers.pod \
-	     memcached_generate_hash_value.pod \
-	     memcached_get.pod \
-	     memcached_memory_allocators.pod \
-	     memcached_pool.pod \
-			 memcached_quit.pod \
-			 memcached_result_st.pod \
-			 memcached_sasl.pod \
-			 memcached_server_st.pod \
-	     memcached_servers.pod \
-	     memcached_set.pod \
-	     memcached_stats.pod \
-	     memcached_strerror.pod \
-	     memcached_user_data.pod \
-	     memcached_verbosity.pod \
-	     memcached_version.pod \
-	     memcapable.pod \
-	     memcat.pod \
-	     memcp.pod \
-	     memdump.pod \
-	     memerror.pod \
-	     memflush.pod \
-	     memrm.pod \
-	     memslap.pod \
-	     memstat.pod
+	   hashkit_create.pod \
+	   hashkit_functions.pod \
+	   hashkit_value.pod \
+	   libmemcached.pod \
+	   libmemcached_examples.pod \
+	   libmemcachedutil.pod \
+	   memcached_analyze.pod \
+	   memcached_auto.pod \
+	   memcached_behavior.pod \
+	   memcached_callback.pod \
+	   memcached_create.pod \
+	   memcached_delete.pod \
+	   memcached_dump.pod \
+	   memcached_flush.pod \
+	   memcached_flush_buffers.pod \
+	   memcached_generate_hash_value.pod \
+	   memcached_get.pod \
+	   memcached_memory_allocators.pod \
+	   memcached_pool.pod \
+	   memcached_quit.pod \
+	   memcached_result_st.pod \
+	   memcached_sasl.pod \
+	   memcached_server_st.pod \
+	   memcached_servers.pod \
+	   memcached_set.pod \
+	   memcached_stats.pod \
+	   memcached_strerror.pod \
+	   memcached_user_data.pod \
+	   memcached_verbosity.pod \
+	   memcached_version.pod \
+	   memcapable.pod \
+	   memcat.pod \
+	   memcp.pod \
+	   memdump.pod \
+	   memerror.pod \
+	   memflush.pod \
+	   memrm.pod \
+	   memslap.pod \
+	   memstat.pod
 EXTRA_DIST+= $(POD_FILES)
 
 man_MANS = \
diff --git a/tests/include.am b/tests/include.am
index 01c541e6..5a65b6c2 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -15,18 +15,6 @@ TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
 EXTRA_DIST+= \
-						 tests/cpp_example.cc \
-						 tests/output_plus.res \
-						 tests/r/memcat.res \
-						 tests/r/memcp.res \
-						 tests/r/memrm.res \
-						 tests/r/memslap.res \
-						 tests/r/memstat.res \
-						 tests/t/memcat.test \
-						 tests/t/memcp.test \
-						 tests/t/memrm.test \
-						 tests/t/memslap.test \
-						 tests/t/memstat.test
 
 noinst_HEADERS+= \
 		 tests/hash_results.h \
@@ -55,11 +43,11 @@ tests_libtest_la_SOURCES= tests/test.c
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_DEPENDENCIES= \
-		     clients/libgenexec.la \
-		     tests/libserver.la \
-		     tests/libtest.la \
-		     libmemcached/libmemcachedinternal.la \
-                     $(TESTS_LDADDS)
+			    clients/libgenexec.la \
+			    tests/libserver.la \
+			    tests/libtest.la \
+			    libmemcached/libmemcachedinternal.la \
+			    $(TESTS_LDADDS)
 tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
 
 tests_testplus_SOURCES= tests/plus.cpp
@@ -69,19 +57,19 @@ tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_DEPENDENCIES= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	$(TESTS_LDADDS)
+				clients/libgenexec.la \
+				tests/libserver.la \
+				tests/libtest.la \
+				$(TESTS_LDADDS)
 tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
 
 tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testudp_SOURCES= tests/mem_udp.c
 tests_testudp_DEPENDENCIES= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	$(TESTS_LDADDS)
+			    clients/libgenexec.la \
+			    tests/libserver.la \
+			    tests/libtest.la \
+			    $(TESTS_LDADDS)
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
 tests_startservers_SOURCES= tests/start.c