Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-1701.0.15

25 files changed, 154 insertions, 289 deletions

diff --git a/libmemcached-1.0/t/include.am b/libmemcached-1.0/t/include.am
index 82136cd8..2a6c512b 100644
--- a/libmemcached-1.0/t/include.am
+++ b/libmemcached-1.0/t/include.am
@@ -14,14 +14,12 @@ if SHARED_ENABLED
 # Test linking with C application
 libmemcached_1_0_t_c_test_SOURCES= libmemcached-1.0/t/c_test.c
 libmemcached_1_0_t_c_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/c_test
 noinst_PROGRAMS+= libmemcached-1.0/t/c_test
 
 # Test linking with C application/SASL include
 libmemcached_1_0_t_c_sasl_test_SOURCES= libmemcached-1.0/t/c_sasl_test.c
 libmemcached_1_0_t_c_sasl_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
 noinst_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
 else
@@ -30,6 +28,5 @@ endif
 # Test linking with C++ application
 libmemcached_1_0_t_cc_test_SOURCES= libmemcached-1.0/t/cc_test.cc
 libmemcached_1_0_t_cc_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_cc_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/cc_test
 noinst_PROGRAMS+= libmemcached-1.0/t/cc_test
diff --git a/libmemcached/common.h b/libmemcached/common.h
index 53e083a4..cc38b56d 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -111,7 +111,9 @@
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
 
-#include <libmemcached/instance.h>
+#ifdef __cplusplus
+# include "libmemcached/instance.hpp"
+#endif
 #include <libmemcached/server_instance.h>
 
 #ifdef HAVE_POLL_H
diff --git a/libmemcached/flush.cc b/libmemcached/flush.cc
index 1e1533dd..7a102eab 100644
--- a/libmemcached/flush.cc
+++ b/libmemcached/flush.cc
@@ -86,7 +86,7 @@ static memcached_return_t memcached_flush_binary(memcached_st *ptr,
   {
     org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
 
-    if (memcached_instance_response_count(instance) > 0)
+    if (instance->response_count() > 0)
     {
       (void)memcached_response(instance, NULL, 0, NULL);
     }
diff --git a/libmemcached/get.cc b/libmemcached/get.cc
index b774e7d5..88f8b56a 100644
--- a/libmemcached/get.cc
+++ b/libmemcached/get.cc
@@ -246,7 +246,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
   {
     org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
 
-    if (memcached_instance_response_count(instance))
+    if (instance->response_count())
     {
       char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
@@ -255,7 +255,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
         memcached_io_write(instance);
       }
 
-      while(memcached_instance_response_count(instance))
+      while(instance->response_count())
       {
         (void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
       }
@@ -304,7 +304,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
     };
 
 
-    if (memcached_instance_response_count(instance) == 0)
+    if (instance->response_count() == 0)
     {
       rc= memcached_connect(instance);
 
@@ -356,7 +356,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
   {
     org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
 
-    if (memcached_instance_response_count(instance))
+    if (instance->response_count())
     {
       /* We need to do something about non-connnected hosts in the future */
       if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
@@ -480,7 +480,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
 
     org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
 
-    if (memcached_instance_response_count(instance) == 0)
+    if (instance->response_count() == 0)
     {
       rc= memcached_connect(instance);
       if (memcached_failed(rc))
@@ -554,7 +554,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr,
       org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
       initialize_binary_request(instance, request.message.header);
 
-      if (memcached_instance_response_count(instance))
+      if (instance->response_count())
       {
         if (memcached_io_write(instance) == false)
         {
@@ -624,7 +624,7 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr,
 
       org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server);
 
-      if (memcached_instance_response_count(instance) == 0)
+      if (instance->response_count() == 0)
       {
         rc= memcached_connect(instance);
 
diff --git a/libmemcached/include.am b/libmemcached/include.am
index e026e1a0..74da20f0 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -26,7 +26,6 @@ noinst_HEADERS+= libmemcached/encoding_key.h
 noinst_HEADERS+= libmemcached/error.hpp 
 noinst_HEADERS+= libmemcached/flag.hpp 
 noinst_HEADERS+= libmemcached/initialize_query.h 
-noinst_HEADERS+= libmemcached/instance.h 
 noinst_HEADERS+= libmemcached/instance.hpp
 noinst_HEADERS+= libmemcached/internal.h 
 noinst_HEADERS+= libmemcached/io.h 
@@ -52,7 +51,7 @@ noinst_HEADERS+= libmemcached/virtual_bucket.h
 noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_DEPENDENCIES=
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
@@ -128,7 +127,7 @@ BUILT_SOURCES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/libmemcached_probes.o
 
-libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 endif
diff --git a/libmemcached/instance.cc b/libmemcached/instance.cc
index 41f491e8..dea8dd62 100644
--- a/libmemcached/instance.cc
+++ b/libmemcached/instance.cc
@@ -170,31 +170,10 @@ void __instance_free(org::libmemcached::Instance* self)
 
 void memcached_instance_free(org::libmemcached::Instance* self)
 {
-  if (self == NULL)
-  {
-    return;
-  }
-
-  __instance_free(self);
-}
-
-/*
-  If we do not have a valid object to clone from, we toss an error.
-*/
-memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source)
-{
-  /* We just do a normal create if source is missing */
-  if (source == NULL)
+  if (self)
   {
-    return NULL;
+    __instance_free(self);
   }
-
-  memcached_string_t hostname= { memcached_string_make_from_cstr(source->hostname) };
-  return __server_create_with(source->root, NULL,
-                              hostname,
-                              source->port(), source->weight,
-                              source->type);
-
 }
 
 memcached_return_t memcached_server_cursor(const memcached_st *ptr,
@@ -341,26 +320,6 @@ memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
   return (memcached_server_instance_st)self->last_disconnected_server;
 }
 
-const char *memcached_instance_name(const memcached_server_instance_st self)
-{
-  WATCHPOINT_ASSERT(self);
-  if (self == NULL)
-    return NULL;
-
-  return self->hostname;
-}
-
-in_port_t memcached_instance_port(const memcached_server_instance_st self)
-{
-  WATCHPOINT_ASSERT(self);
-  if (self == NULL)
-  {
-    return 0;
-  }
-
-  return self->port();
-}
-
 void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)
 {
   WATCHPOINT_ASSERT(self);
@@ -369,14 +328,3 @@ void memcached_instance_next_retry(memcached_server_instance_st self, const time
     ((org::libmemcached::Instance*)self)->next_retry= absolute_time;
   }
 }
-
-uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self)
-{
-  WATCHPOINT_ASSERT(self);
-  if (self == NULL)
-  {
-    return 0;
-  }
-
-  return self->cursor_active_;
-}
diff --git a/libmemcached/instance.h b/libmemcached/instance.h
deleted file mode 100644
index e564afaa..00000000
--- a/libmemcached/instance.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached library
- *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/ 
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-
-#pragma once
-
-#ifndef WIN32
-# ifdef HAVE_NETDB_H
-#  include <netdb.h>
-# endif
-#endif
-
-#ifdef NI_MAXHOST
-# define MEMCACHED_NI_MAXHOST NI_MAXHOST
-#else
-# define MEMCACHED_NI_MAXHOST 1025
-#endif
-
-#ifdef NI_MAXSERV
-# define MEMCACHED_NI_MAXSERV NI_MAXSERV
-#else
-# define MEMCACHED_NI_MAXSERV 32
-#endif
-
-#ifdef __cplusplus
-
-namespace org {
-namespace libmemcached {
-
-// @todo Complete class transformation
-struct Instance {
-  in_port_t port() const
-  {
-    return port_;
-  }
-
-  void port(in_port_t arg)
-  {
-    port_= arg;
-  }
-
-  void mark_server_as_clean()
-  {
-    server_failure_counter= 0;
-    next_retry= 0;
-  }
-
-  void disable()
-  {
-  }
-
-  void enable()
-  {
-  }
-
-  uint32_t response_count() const
-  {
-    return cursor_active_;
-  }
-
-  struct {
-    bool is_allocated:1;
-    bool is_initialized:1;
-    bool is_shutting_down:1;
-    bool is_dead:1;
-  } options;
-  uint32_t cursor_active_;
-  in_port_t port_;
-  memcached_socket_t fd;
-  uint32_t io_bytes_sent; /* # bytes sent since last read */
-  uint32_t request_id;
-  uint32_t server_failure_counter;
-  uint64_t server_failure_counter_query_id;
-  uint32_t weight;
-  uint32_t version;
-  enum memcached_server_state_t state;
-  struct {
-    uint32_t read;
-    uint32_t write;
-    uint32_t timeouts;
-    size_t _bytes_read;
-  } io_wait_count;
-  uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
-  uint8_t micro_version; // ditto, and note that this is the third, not second version bit
-  uint8_t minor_version; // ditto
-  memcached_connection_t type;
-  char *read_ptr;
-  size_t read_buffer_length;
-  size_t read_data_length;
-  size_t write_buffer_offset;
-  struct addrinfo *address_info;
-  struct addrinfo *address_info_next;
-  time_t next_retry;
-  struct memcached_st *root;
-  uint64_t limit_maxbytes;
-  struct memcached_error_t *error_messages;
-  char read_buffer[MEMCACHED_MAX_BUFFER];
-  char write_buffer[MEMCACHED_MAX_BUFFER];
-  char hostname[MEMCACHED_NI_MAXHOST];
-};
-
-} // namespace libmemcached
-} // namespace org
-
-#endif
diff --git a/libmemcached/instance.hpp b/libmemcached/instance.hpp
index e8d44058..fba02b2f 100644
--- a/libmemcached/instance.hpp
+++ b/libmemcached/instance.hpp
@@ -38,6 +38,102 @@
 
 #pragma once
 
+#ifndef WIN32
+# ifdef HAVE_NETDB_H
+#  include <netdb.h>
+# endif
+#endif
+
+#ifdef NI_MAXHOST
+# define MEMCACHED_NI_MAXHOST NI_MAXHOST
+#else
+# define MEMCACHED_NI_MAXHOST 1025
+#endif
+
+#ifdef NI_MAXSERV
+# define MEMCACHED_NI_MAXSERV NI_MAXSERV
+#else
+# define MEMCACHED_NI_MAXSERV 32
+#endif
+
+namespace org {
+namespace libmemcached {
+
+// @todo Complete class transformation
+struct Instance {
+  in_port_t port() const
+  {
+    return port_;
+  }
+
+  void port(in_port_t arg)
+  {
+    port_= arg;
+  }
+
+  void mark_server_as_clean()
+  {
+    server_failure_counter= 0;
+    next_retry= 0;
+  }
+
+  void disable()
+  {
+  }
+
+  void enable()
+  {
+  }
+
+  uint32_t response_count() const
+  {
+    return cursor_active_;
+  }
+
+  struct {
+    bool is_allocated:1;
+    bool is_initialized:1;
+    bool is_shutting_down:1;
+    bool is_dead:1;
+  } options;
+  uint32_t cursor_active_;
+  in_port_t port_;
+  memcached_socket_t fd;
+  uint32_t io_bytes_sent; /* # bytes sent since last read */
+  uint32_t request_id;
+  uint32_t server_failure_counter;
+  uint64_t server_failure_counter_query_id;
+  uint32_t weight;
+  uint32_t version;
+  enum memcached_server_state_t state;
+  struct {
+    uint32_t read;
+    uint32_t write;
+    uint32_t timeouts;
+    size_t _bytes_read;
+  } io_wait_count;
+  uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
+  uint8_t micro_version; // ditto, and note that this is the third, not second version bit
+  uint8_t minor_version; // ditto
+  memcached_connection_t type;
+  char *read_ptr;
+  size_t read_buffer_length;
+  size_t read_data_length;
+  size_t write_buffer_offset;
+  struct addrinfo *address_info;
+  struct addrinfo *address_info_next;
+  time_t next_retry;
+  struct memcached_st *root;
+  uint64_t limit_maxbytes;
+  struct memcached_error_t *error_messages;
+  char read_buffer[MEMCACHED_MAX_BUFFER];
+  char write_buffer[MEMCACHED_MAX_BUFFER];
+  char hostname[MEMCACHED_NI_MAXHOST];
+};
+
+} // namespace libmemcached
+} // namespace org
+
 org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
                                                     org::libmemcached::Instance* self,
                                                     const memcached_string_t& hostname,
@@ -45,14 +141,6 @@ org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
                                                     uint32_t weight, 
                                                     const memcached_connection_t type);
 
-const char *memcached_instance_name(const org::libmemcached::Instance* self);
-
-in_port_t memcached_instance_port(const org::libmemcached::Instance* self);
-
 memcached_return_t memcached_instance_push(memcached_st *ptr, const org::libmemcached::Instance*, uint32_t);
 
-memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source);
-
-uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
-
 void __instance_free(org::libmemcached::Instance *);
diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index b1f1327c..8cee0178 100644
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -742,7 +742,7 @@ org::libmemcached::Instance* memcached_io_get_readable_server(memcached_st *memc
       return instance;
     }
 
-    if (memcached_instance_response_count(instance) > 0)
+    if (instance->response_count() > 0)
     {
       fds[host_index].events= POLLIN;
       fds[host_index].revents= 0;
@@ -758,7 +758,7 @@ org::libmemcached::Instance* memcached_io_get_readable_server(memcached_st *memc
     {
       org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
 
-      if (memcached_instance_response_count(instance) > 0)
+      if (instance->response_count() > 0)
       {
         return instance;
       }
diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am
index fafef9a3..f71472e3 100644
--- a/libmemcachedinternal/include.am
+++ b/libmemcachedinternal/include.am
@@ -23,5 +23,5 @@ libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS= \
 						       ${NO_CONVERSION} \
 						       -DBUILDING_LIBMEMCACHEDINTERNAL
 libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD)
-libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(libmemcached_libmemcached_la_DEPENDENCIES)
+EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES)
 endif
diff --git a/libmemcachedinternal/util/include.am b/libmemcachedinternal/util/include.am
index 7b5e8007..f5ac3cb0 100644
--- a/libmemcachedinternal/util/include.am
+++ b/libmemcachedinternal/util/include.am
@@ -12,8 +12,6 @@ libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS= \
 							   ${AM_CXXFLAGS} \
 							   ${NO_CONVERSION} \
 							   -DBUILDING_LIBMEMCACHEDINTERNAL
-libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS}
-libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la
-
-
+libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD+= @PTHREAD_LIBS@
diff --git a/libmemcachedutil/include.am b/libmemcachedutil/include.am
index e0b1fe95..c105ee6e 100644
--- a/libmemcachedutil/include.am
+++ b/libmemcachedutil/include.am
@@ -16,7 +16,6 @@ libmemcached_libmemcachedutil_la_SOURCES= \
 libmemcached_libmemcachedutil_la_LIBADD=
 libmemcached_libmemcachedutil_la_LDFLAGS=
 libmemcached_libmemcachedutil_la_CXXFLAGS=
-libmemcached_libmemcachedutil_la_DEPENDENCIES=
 libmemcached_libmemcachedutil_la_CXXFLAGS+= \
 					   ${AM_CXXFLAGS} \
 					   ${NO_CONVERSION} \
@@ -25,5 +24,3 @@ libmemcached_libmemcachedutil_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 libmemcached_libmemcachedutil_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_LIBADD+= libmemcached/libmemcached.la
 libmemcached_libmemcachedutil_la_LIBADD+= @PTHREAD_LIBS@
-libmemcached_libmemcachedutil_la_DEPENDENCIES+= libmemcached/libmemcached.la
-
diff --git a/libtest/include.am b/libtest/include.am
index fe43701f..17ec255c 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -94,7 +94,7 @@ noinst_HEADERS+= libtest/wait.h
 noinst_LTLIBRARIES+= libtest/libtest.la
 
 libtest_libtest_la_CXXFLAGS=
-libtest_libtest_la_DEPENDENCIES=
+EXTRA_libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
@@ -139,23 +139,25 @@ libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
 libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_LIBADD+= @RT_LIB@
 
-libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-libtest_libtest_la_DEPENDENCIES+=libtest/abort
-libtest_libtest_la_DEPENDENCIES+=libtest/wait
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
 
 # Declare unittest so that we can append to it
 libtest_unittest_CXXFLAGS=
 libtest_unittest_LDADD=
-libtest_unittest_DEPENDENCIES=
 
 # We are either building in tree, or with
 if BUILDING_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED
 
 libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED
+libtest_unittest_LDADD+= libmemcached/libmemcached.la
 else
 if HAVE_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS)
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 else
 libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
@@ -175,7 +177,8 @@ libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc
 libtest_libtest_la_SOURCES+= util/operation.cc
-libtest_unittest_DEPENDENCIES+= gearmand/gearmand
+
+libtest_unittest_LDADD+= libgearman/libgearman.la
 else
 if HAVE_LIBGEARMAN
 libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
@@ -193,7 +196,6 @@ libtest_tmp_dir: | $(TMP_DIR)
 $(TMP_DIR):
 	@$(mkdir_p) $(TMP_DIR)
 
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la
 libtest_unittest_LDADD+= libtest/libtest.la
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
diff --git a/tests/cli.am b/tests/cli.am
index b42d394f..2847de90 100644
--- a/tests/cli.am
+++ b/tests/cli.am
@@ -11,77 +11,77 @@
 
 tests_memcapable_SOURCES= tests/memcapable.cc
 tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcapable
+EXTRA_tests_memcapable_DEPENDENCIES= clients/memcapable
 tests_memcapable_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcapable
 noinst_PROGRAMS+= tests/memcapable
 
 tests_memstat_SOURCES= tests/memstat.cc
 tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memstat
+EXTRA_tests_memstat_DEPENDENCIES= clients/memstat
 tests_memstat_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memstat
 noinst_PROGRAMS+= tests/memstat
 
 tests_memcp_SOURCES= tests/memcp.cc
 tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcp
+EXTRA_tests_memcp_DEPENDENCIES= clients/memcp
 tests_memcp_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcp
 noinst_PROGRAMS+= tests/memcp
 
 tests_memflush_SOURCES= tests/memflush.cc
 tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memflush
+EXTRA_tests_memflush_DEPENDENCIES= clients/memflush
 tests_memflush_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memflush
 noinst_PROGRAMS+= tests/memflush
 
 tests_memrm_SOURCES= tests/memrm.cc
 tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memrm
+EXTRA_tests_memrm_DEPENDENCIES= clients/memrm
 tests_memrm_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memrm
 noinst_PROGRAMS+= tests/memrm
 
 tests_memexist_SOURCES= tests/memexist.cc
 tests_memexist_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memexist_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memexist
+EXTRA_tests_memexist_DEPENDENCIES= clients/memexist
 tests_memexist_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memexist
 noinst_PROGRAMS+= tests/memexist
 
 tests_memtouch_SOURCES= tests/memtouch.cc
 tests_memtouch_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memtouch_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memtouch
+EXTRA_tests_memtouch_DEPENDENCIES= clients/memtouch
 tests_memtouch_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memtouch
 noinst_PROGRAMS+= tests/memtouch
 
 tests_memcat_SOURCES= tests/memcat.cc
 tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcat
+EXTRA_tests_memcat_DEPENDENCIES= clients/memcat
 tests_memcat_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcat
 noinst_PROGRAMS+= tests/memcat
 
 tests_memerror_SOURCES= tests/memerror.cc
 tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memerror
+EXTRA_tests_memerror_DEPENDENCIES= clients/memerror
 tests_memerror_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memerror
 noinst_PROGRAMS+= tests/memerror
 
 tests_memslap_SOURCES= tests/memslap.cc
 tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memslap
+EXTRA_tests_memslap_DEPENDENCIES= clients/memslap
 tests_memslap_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memslap
 noinst_PROGRAMS+= tests/memslap
 
 tests_memdump_SOURCES= tests/memdump.cc
 tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memdump
+EXTRA_tests_memdump_DEPENDENCIES= clients/memdump
 tests_memdump_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memdump
 noinst_PROGRAMS+= tests/memdump
diff --git a/tests/failure.cc b/tests/failure.cc
index abba57ed..b55d68ab 100644
--- a/tests/failure.cc
+++ b/tests/failure.cc
@@ -102,7 +102,7 @@ static test_return_t restart_servers(memcached_st *)
   return TEST_SUCCESS;
 }
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 static test_return_t cull_TEST(memcached_st *memc)
 {
   uint32_t count= memcached_server_count(memc);
diff --git a/tests/include.am b/tests/include.am
index 7e924604..0ac1d898 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -29,8 +29,7 @@ tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_cycle_CXXFLAGS= $(AM_CXXFLAGS)
 tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS}
 tests_cycle_SOURCES= tests/cycle.cc
-tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
-tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+tests_cycle_LDADD= $(TESTS_LDADDS)
 tests_cycle_LDADD+= ${PTHREAD_LIBS}
 check_PROGRAMS+= tests/cycle
 noinst_PROGRAMS+= tests/cycle
@@ -49,8 +48,7 @@ tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
 tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
 
 tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
-tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
-tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
+tests_failure_LDADD= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/failure
 noinst_PROGRAMS+= tests/failure
 
@@ -62,8 +60,7 @@ gdb-failure: tests/failure
 
 
 tests_testhashkit_SOURCES= tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testhashkit
 noinst_PROGRAMS+= tests/testhashkit
 
@@ -73,8 +70,7 @@ test-hash: tests/testhashkit
 
 tests_hash_plus_SOURCES= tests/hash_plus.cc
 tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD= $(tests_testhashkit_LDADD)
 check_PROGRAMS+= tests/hash_plus
 noinst_PROGRAMS+= tests/hash_plus
 
diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc
index 6beccc85..f7d4b34c 100644
--- a/tests/libmemcached-1.0/debug.cc
+++ b/tests/libmemcached-1.0/debug.cc
@@ -46,7 +46,7 @@ using namespace libtest;
 #include <tests/debug.h>
 #include <tests/print.h>
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 /* Dump each server's keys */
 static memcached_return_t print_keys_callback(const memcached_st *,
diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index a9077c81..6db1187f 100644
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -42,7 +42,6 @@ if HAVE_DTRACE
 else
 # Test internals
 tests_libmemcached_1_0_internals_CXXFLAGS=
-tests_libmemcached_1_0_internals_DEPENDENCIES=
 tests_libmemcached_1_0_internals_LDADD=
 tests_libmemcached_1_0_internals_SOURCES=
 
@@ -50,9 +49,6 @@ tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc
 tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
 tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
 tests_libmemcached_1_0_internals_CXXFLAGS+= @PTHREAD_CFLAGS@
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
 tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
 tests_libmemcached_1_0_internals_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
@@ -68,7 +64,6 @@ endif
 tests_libmemcached_1_0_testapp_CXXFLAGS=
 tests_libmemcached_1_0_testapp_CFLAGS=
 tests_libmemcached_1_0_testapp_SOURCES=
-tests_libmemcached_1_0_testapp_DEPENDENCIES=
 tests_libmemcached_1_0_testapp_LDADD=
 
 tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
@@ -103,10 +98,6 @@ tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/setup_and_teardo
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/stat.cc
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/touch.cc
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
 
 tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
@@ -121,7 +112,6 @@ noinst_PROGRAMS+= tests/libmemcached-1.0/testapp
 tests_libmemcached_1_0_testsocket_CXXFLAGS=
 tests_libmemcached_1_0_testsocket_CFLAGS=
 tests_libmemcached_1_0_testsocket_SOURCES=
-tests_libmemcached_1_0_testsocket_DEPENDENCIES=
 tests_libmemcached_1_0_testsocket_LDADD=
 
 tests_libmemcached_1_0_testsocket_CXXFLAGS+= @PTHREAD_CFLAGS@
@@ -159,11 +149,6 @@ tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/stat.cc
 tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/touch.cc
 tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
 
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-
 tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
@@ -224,11 +209,9 @@ gdb-sasl: tests/libmemcached-1.0/sasl
 	@$(GDB_COMMAND)  tests/libmemcached-1.0/sasl
 
 tests_atomsmasher_SOURCES=
-tests_atomsmasher_DEPENDENCIES=
 tests_atomsmasher_LDADD=
 
-tests_atomsmasher_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_atomsmasher_LDADD+= $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_LDADD+= $(TESTS_LDADDS)
 tests_atomsmasher_SOURCES+= clients/execute.cc
 tests_atomsmasher_SOURCES+= clients/generator.cc
 tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc
@@ -241,7 +224,6 @@ noinst_PROGRAMS+= tests/atomsmasher
 
 tests_testudp_CFLAGS=
 tests_testudp_SOURCES=
-tests_testudp_DEPENDENCIES=
 tests_testudp_LDADD=
 
 tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -252,8 +234,7 @@ tests_testudp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
 tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
 tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc
 tests_testudp_SOURCES+= tests/mem_udp.cc
-tests_testudp_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testudp_LDADD+= $(tests_testudp_DEPENDENCIES)
+tests_testudp_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testudp
 noinst_PROGRAMS+= tests/testudp
 
@@ -262,7 +243,6 @@ test-udp: tests/testudp
 
 tests_testplus_SOURCES=
 tests_testplus_CXXFLAGS=
-tests_testplus_DEPENDENCIES=
 tests_testplus_LDADD=
 
 tests_testplus_SOURCES+= clients/execute.cc
@@ -274,8 +254,7 @@ tests_testplus_SOURCES+= tests/libmemcached-1.0/plus.cpp
 tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc
 
 tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
+tests_testplus_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testplus
 noinst_PROGRAMS+= tests/testplus
 
diff --git a/tests/libmemcached-1.0/ketama.cc b/tests/libmemcached-1.0/ketama.cc
index 2fd726a6..44fefc7e 100644
--- a/tests/libmemcached-1.0/ketama.cc
+++ b/tests/libmemcached-1.0/ketama.cc
@@ -41,7 +41,7 @@
 
 #include "libmemcached/server_instance.h"
 #include "libmemcached/continuum.hpp"
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 #include <tests/ketama.h>
 #include <tests/ketama_test_cases.h>
diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 81d63506..068d5197 100644
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -92,7 +92,7 @@ using namespace libtest;
 
 #include "tests/keys.hpp"
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options)
 {
diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index 33f95c5a..2e8e5cd6 100644
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -49,7 +49,7 @@ using namespace libtest;
 
 #include <tests/libmemcached-1.0/parser.h>
 #include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 enum scanner_type_t
 {
diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc
index 2e008d39..30cc9660 100644
--- a/tests/libmemcached-1.0/pool.cc
+++ b/tests/libmemcached-1.0/pool.cc
@@ -55,7 +55,7 @@ using namespace libtest;
 #include <pthread.h>
 #include <poll.h>
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
diff --git a/tests/libmemcached-1.0/replication.cc b/tests/libmemcached-1.0/replication.cc
index 363eaadb..1a22a220 100644
--- a/tests/libmemcached-1.0/replication.cc
+++ b/tests/libmemcached-1.0/replication.cc
@@ -113,7 +113,7 @@ test_return_t replication_set_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 test_return_t replication_get_test(memcached_st *memc)
 {
diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc
index 6e282d55..d5924471 100644
--- a/tests/mem_udp.cc
+++ b/tests/mem_udp.cc
@@ -63,7 +63,7 @@ using namespace libtest;
 
 #include <libtest/server.h>
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
diff --git a/tests/parser.am b/tests/parser.am
index 25ab3db4..e0e19987 100644
--- a/tests/parser.am
+++ b/tests/parser.am
@@ -12,14 +12,12 @@ noinst_HEADERS+= tests/libmemcached-1.0/parser.h
 
 tests_parser_SOURCES=
 tests_parser_CXXFLAGS=
-tests_parser_DEPENDENCIES=
 tests_parser_LDADD=
 
 tests_parser_SOURCES+= tests/parser.cc
 
 tests_parser_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_parser_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_parser_LDADD+= $(tests_parser_DEPENDENCIES)
+tests_parser_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/parser
 noinst_PROGRAMS+= tests/parser
 
@@ -27,4 +25,4 @@ test-parser: tests/parser
 	@tests/parser
 
 valgrind-parser: tests/parser
-	$(VALGRIND_COMMAND) tests/parser
+	@$(VALGRIND_COMMAND) tests/parser