From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 17 Dec 2009 20:13:13 +0000 (-0800)
Subject: Moved clients and libmemcached to being included in root build.
X-Git-Tag: 0.37~57^2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ab1cac43b7d6b8401ec0c196ed6bbab84e7c1a49;p=m6w6%2Flibmemcached

Moved clients and libmemcached to being included in root build.
---

diff --git a/Makefile.am b/Makefile.am
index e687f9ce..5dd028a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,23 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached support clients tests example
-EXTRA_dist = README.FIRST
+# includes append to these:
+SUFFIXES =
+TESTS =
+bin_PROGRAMS =
+noinst_HEADERS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+pkginclude_HEADERS =
+nobase_pkginclude_HEADERS =
+EXTRA_HEADERS =
+BUILT_SOURCES=
+EXTRA_DIST = README.FIRST
+
+SUBDIRS = . docs support tests example 
+
+include libmemcached/include.am
+include clients/include.am
 
 check-local: test-no-outputdiff
 
diff --git a/clients/Makefile.am b/clients/Makefile.am
deleted file mode 100644
index e3939eb2..00000000
--- a/clients/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-LDADDS = libutilities.la $(top_builddir)/libmemcached/libmemcached.la
-
-bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memerror memcapable
-
-if HAVE_LIBEVENT
-  bin_PROGRAMS += memslap
-endif
-
-noinst_HEADERS = \
-		client_options.h \
-		execute.h \
-		generator.h \
-		ms_atomic.h \
-		ms_conn.h \
-		ms_memslap.h \
-		ms_setting.h \
-		ms_sigsegv.h \
-		ms_stats.h \
-		ms_task.h \
-		ms_thread.h \
-		utilities.h
-
-noinst_LTLIBRARIES= libutilities.la libgenexec.la
-
-libutilities_la_SOURCES= utilities.c
-libgenexec_la_SOURCES= generator.c execute.c
-
-memcat_SOURCES = memcat.c
-memcat_LDADD = $(LDADDS)
-
-memcp_SOURCES = memcp.c
-memcp_LDADD = $(LDADDS)
-
-memdump_SOURCES = memdump.c
-memdump_LDADD = $(LDADDS)
-
-memstat_SOURCES = memstat.c
-memstat_LDADD = $(LDADDS)
-
-memrm_SOURCES = memrm.c
-memrm_LDADD = $(LDADDS)
-
-memflush_SOURCES = memflush.c
-memflush_LDADD = $(LDADDS)
-
-memerror_SOURCES = memerror.c
-memerror_LDADD = $(LDADDS)
-
-memslap_SOURCES = \
-		memslap.c \
-		ms_conn.c \
-		ms_setting.c \
-		ms_sigsegv.c \
-		ms_stats.c \
-		ms_task.c \
-		ms_thread.c
-memslap_LDADD = $(LTLIBEVENT) libgenexec.la $(LDADDS)
-
-memcapable_SOURCES = memcapable.c
-if BUILD_BYTEORDER
-memcapable_LDADD=$(top_builddir)/libmemcached/libbyteorder.la
-endif
-
-test-start-server:
-	memflush --servers=localhost
-	memcp --servers=localhost /etc/services
-	memcat --servers=localhost /etc/services
-	memrm --servers=localhost /etc/services
-	memstat --servers=localhost
-	memslap --servers=localhost
-	memslap --servers=localhost --concurrency=10
-	memslap --servers=localhost --concurrency=10 --initial-load=1000
-	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
-	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
-	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
-	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
-
-valgrind:
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
diff --git a/clients/include.am b/clients/include.am
new file mode 100644
index 00000000..d91ebc66
--- /dev/null
+++ b/clients/include.am
@@ -0,0 +1,100 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+CLIENTS_LDADDS = \
+	clients/libutilities.la \
+	libmemcached/libmemcached.la
+
+bin_PROGRAMS+= \
+	clients/memcapable \
+	clients/memcat \
+	clients/memcp \
+	clients/memdump \
+	clients/memerror \
+	clients/memflush \
+	clients/memrm \
+	clients/memstat
+
+if HAVE_LIBEVENT
+  bin_PROGRAMS+= clients/memslap
+endif
+
+noinst_HEADERS+= \
+		clients/client_options.h \
+		clients/execute.h \
+		clients/generator.h \
+		clients/ms_atomic.h \
+		clients/ms_conn.h \
+		clients/ms_memslap.h \
+		clients/ms_setting.h \
+		clients/ms_sigsegv.h \
+		clients/ms_stats.h \
+		clients/ms_task.h \
+		clients/ms_thread.h \
+		clients/utilities.h
+
+noinst_LTLIBRARIES+= clients/libutilities.la
+clients_libutilities_la_SOURCES= clients/utilities.c
+
+noinst_LTLIBRARIES+= clients/libgenexec.la
+clients_libgenexec_la_SOURCES= clients/generator.c clients/execute.c
+
+clients_memcat_SOURCES= clients/memcat.c
+clients_memcat_LDADD= $(CLIENTS_LDADDS)
+
+clients_memcp_SOURCES= clients/memcp.c
+clients_memcp_LDADD= $(CLIENTS_LDADDS)
+
+clients_memdump_SOURCES= clients/memdump.c
+clients_memdump_LDADD= $(CLIENTS_LDADDS)
+
+clients_memstat_SOURCES= clients/memstat.c
+clients_memstat_LDADD= $(CLIENTS_LDADDS)
+
+clients_memrm_SOURCES= clients/memrm.c
+clients_memrm_LDADD= $(CLIENTS_LDADDS)
+
+clients_memflush_SOURCES= clients/memflush.c
+clients_memflush_LDADD= $(CLIENTS_LDADDS)
+
+clients_memerror_SOURCES= clients/memerror.c
+clients_memerror_LDADD= $(CLIENTS_LDADDS)
+
+clients_memslap_SOURCES= \
+		clients/memslap.c \
+		clients/ms_conn.c \
+		clients/ms_setting.c \
+		clients/ms_sigsegv.c \
+		clients/ms_stats.c \
+		clients/ms_task.c \
+		clients/ms_thread.c
+clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
+
+clients_memcapable_SOURCES= clients/memcapable.c
+if BUILD_BYTEORDER
+clients_memcapable_LDADD= libmemcached/libbyteorder.la
+endif
+
+test-start-server:
+	clients/memflush --servers=localhost
+	clients/memcp --servers=localhost /etc/services
+	clients/memcat --servers=localhost /etc/services
+	clients/memrm --servers=localhost /etc/services
+	clients/memstat --servers=localhost
+	clients/memslap --servers=localhost
+	clients/memslap --servers=localhost --concurrency=10
+	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000
+	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
+
+valgrind:
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
diff --git a/configure.ac b/configure.ac
index 98557c2f..7687bf35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,11 +46,9 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
 
 AC_CONFIG_FILES([
   Makefile
-  clients/Makefile
   tests/Makefile
   docs/Makefile
   example/Makefile
-  libmemcached/Makefile
   libmemcached/memcached_configure.h
   support/Makefile
   support/libmemcached.pc
diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
deleted file mode 100644
index e85fecb7..00000000
--- a/libmemcached/Makefile.am
+++ /dev/null
@@ -1,140 +0,0 @@
-EXTRA_DIST = \
-	    libmemcached.ver \
-	    libmemcached_probes.d \
-	    memcached/README.txt \
-	    memcached_configure.h.in \
-	    protocol/libmemcachedprotocol.ver \
-	    util/libmemcachedutil.ver
-
-
-EXTRA_HEADERS =
-BUILT_SOURCES=
-
-noinst_HEADERS = libmemcached_probes.h \
-                 io.h \
-                 internal.h \
-                 common.h \
-                 memcached/protocol_binary.h \
-                 protocol/common.h \
-                 protocol/ascii_handler.h \
-                 protocol/binary_handler.h
-
-pkginclude_HEADERS= \
-		    behavior.h \
-		    callback.h \
-		    constants.h \
-		    exception.hpp \
-		    get.h \
-		    memcached.h \
-		    memcached.hpp \
-		    memcached_configure.h \
-		    protocol_handler.h \
-		    result.h \
-		    server.h \
-		    storage.h \
-		    string.h \
-		    types.h \
-		    visibility.h \
-		    watchpoint.h
-
-nobase_pkginclude_HEADERS = \
-			    protocol/cache.h \
-			    protocol/callback.h
-
-
-libmemcachedprotocol_la_SOURCES =  \
-				    protocol/ascii_handler.c \
-				    protocol/binary_handler.c \
-				    protocol/cache.c \
-				    protocol/pedantic.c \
-				    protocol/protocol_handler.c
-
-libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
-
-lib_LTLIBRARIES = libmemcached.la libmemcachedprotocol.la
-noinst_LTLIBRARIES = libmemcachedcallbacks.la
-libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
-libmemcachedcallbacks_la_SOURCES = callback.c
-
-libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libmemcached_la_SOURCES = \
-			  allocators.c \
-			  analyze.c \
-			  auto.c \
-			  behavior.c \
-			  connect.c \
-			  crc.c \
-			  delete.c \
-			  do.c \
-			  dump.c \
-			  fetch.c \
-			  flush.c \
-			  flush_buffers.c \
-			  get.c \
-			  hash.c \
-			  hosts.c \
-			  io.c \
-			  jenkins_hash.c \
-			  key.c \
-			  md5.c \
-			  memcached.c \
-			  murmur_hash.c \
-			  parse.c \
-			  purge.c \
-			  quit.c \
-			  response.c \
-			  result.c \
-			  server.c \
-			  stats.c \
-			  storage.c \
-			  strerror.c \
-			  string.c \
-			  verbosity.c \
-			  version.c
-
-
-if INCLUDE_HSIEH_SRC
-libmemcached_la_SOURCES += hsieh_hash.c
-endif
-
-libmemcached_la_DEPENDENCIES= libmemcachedcallbacks.la
-libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
-libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
-
-if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= memcached_util.h pool.h
-lib_LTLIBRARIES+= libmemcachedutil.la
-endif
-
-libmemcachedutil_la_SOURCES= util/pool.c
-libmemcachedutil_la_LIBADD= libmemcached.la
-libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
-libmemcachedutil_la_DEPENDENCIES=libmemcached.la
-
-if BUILD_BYTEORDER
-noinst_LTLIBRARIES += libbyteorder.la
-libbyteorder_la_SOURCES= byteorder.c byteorder.h
-libmemcached_la_LIBADD += libbyteorder.la
-libmemcached_la_DEPENDENCIES+= libbyteorder.la
-libmemcachedprotocol_la_LIBADD=libbyteorder.la
-libmemcachedprotocol_la_DEPENDENCIES=libbyteorder.la
-endif
-
-if HAVE_DTRACE
-BUILT_SOURCES+= dtrace_probes.h
-libmemcached_la_SOURCES += libmemcached_probes.d
-endif
-
-if DTRACE_NEEDS_OBJECTS
-libmemcached_la_DEPENDENCIES += libmemcached_probes.o
-endif
-
-SUFFIXES= .d
-
-dtrace_probes.h: libmemcached_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -o dtrace_probes.h -s libmemcached_probes.d
-
-libmemcached_probes.o: libmemcached_probes.d $(libmemcached_la_OBJECTS)
-	$(DTRACE) $(DTRACEFLAGS) -o .libs/libmemcached_probes.o -G -s libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached_probes.o -G -s libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
-
diff --git a/libmemcached/include.am b/libmemcached/include.am
new file mode 100644
index 00000000..ed7ae80d
--- /dev/null
+++ b/libmemcached/include.am
@@ -0,0 +1,143 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+EXTRA_DIST+= \
+	libmemcached/libmemcached.ver \
+	libmemcached/libmemcached_probes.d \
+	libmemcached/memcached/README.txt \
+	libmemcached/memcached_configure.h.in \
+	libmemcached/protocol/libmemcachedprotocol.ver \
+	libmemcached/util/libmemcachedutil.ver
+
+
+noinst_HEADERS+= \
+	libmemcached/byteorder.h \
+	libmemcached/libmemcached_probes.h \
+	libmemcached/io.h \
+	libmemcached/internal.h \
+	libmemcached/common.h \
+	libmemcached/memcached/protocol_binary.h \
+	libmemcached/protocol/common.h \
+	libmemcached/protocol/ascii_handler.h \
+	libmemcached/protocol/binary_handler.h
+
+nobase_pkginclude_HEADERS+= \
+	libmemcached/behavior.h \
+	libmemcached/callback.h \
+	libmemcached/constants.h \
+	libmemcached/exception.hpp \
+	libmemcached/get.h \
+	libmemcached/memcached.h \
+	libmemcached/memcached.hpp \
+	libmemcached/memcached_configure.h \
+	libmemcached/protocol/cache.h \
+	libmemcached/protocol/callback.h \
+	libmemcached/protocol_handler.h \
+	libmemcached/result.h \
+	libmemcached/server.h \
+	libmemcached/storage.h \
+	libmemcached/string.h \
+	libmemcached/types.h \
+	libmemcached/visibility.h \
+	libmemcached/watchpoint.h
+
+
+
+lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
+libmemcached_libmemcachedprotocol_la_SOURCES =  \
+	libmemcached/protocol/ascii_handler.c \
+	libmemcached/protocol/binary_handler.c \
+	libmemcached/protocol/cache.c \
+	libmemcached/protocol/pedantic.c \
+	libmemcached/protocol/protocol_handler.c
+
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
+
+noinst_LTLIBRARIES+= libmemcached/libmemcachedcallbacks.la
+libmemcached_libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
+libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
+
+lib_LTLIBRARIES+= libmemcached/libmemcached.la
+libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+libmemcached_libmemcached_la_SOURCES = \
+	libmemcached/allocators.c \
+	libmemcached/analyze.c \
+	libmemcached/auto.c \
+	libmemcached/behavior.c \
+	libmemcached/connect.c \
+	libmemcached/crc.c \
+	libmemcached/delete.c \
+	libmemcached/do.c \
+	libmemcached/dump.c \
+	libmemcached/fetch.c \
+	libmemcached/flush.c \
+	libmemcached/flush_buffers.c \
+	libmemcached/get.c \
+	libmemcached/hash.c \
+	libmemcached/hosts.c \
+	libmemcached/io.c \
+	libmemcached/jenkins_hash.c \
+	libmemcached/key.c \
+	libmemcached/md5.c \
+	libmemcached/memcached.c \
+	libmemcached/murmur_hash.c \
+	libmemcached/parse.c \
+	libmemcached/purge.c \
+	libmemcached/quit.c \
+	libmemcached/response.c \
+	libmemcached/result.c \
+	libmemcached/server.c \
+	libmemcached/stats.c \
+	libmemcached/storage.c \
+	libmemcached/strerror.c \
+	libmemcached/string.c \
+	libmemcached/verbosity.c \
+	libmemcached/version.c
+
+
+if INCLUDE_HSIEH_SRC
+libmemcached_libmemcached_la_SOURCES += libmemcached/hsieh_hash.c
+endif
+
+libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la
+libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la
+libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/pool.h
+lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
+endif
+
+libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
+libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
+
+if BUILD_BYTEORDER
+noinst_LTLIBRARIES += libmemcached/libbyteorder.la
+libmemcached_libbyteorder_la_SOURCES= libmemcached/byteorder.c
+libmemcached_libmemcached_la_LIBADD += libmemcached/libbyteorder.la
+libmemcached_libmemcached_la_DEPENDENCIES+= libmemcached/libbyteorder.la
+libmemcached_libmemcachedprotocol_la_LIBADD=libmemcached/libbyteorder.la
+libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
+endif
+
+if HAVE_DTRACE
+BUILT_SOURCES+= libmemcached/dtrace_probes.h
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
+endif
+
+if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+endif
+
+SUFFIXES+= .d
+
+libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
+	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s libmemcached/libmemcached_probes.d
+
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d $(libmemcached_libmemcached_la_OBJECTS)
+	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
+	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+