Moved libgearman, libgearman-server and benchmark.

Makefile.am

@@ -10,18 +10,24 @@ ACLOCAL_AMFLAGS= -I m4
 bin_PROGRAMS =
 sbin_PROGRAMS = 
 noinst_PROGRAMS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+nobase_pkginclude_HEADERS =
+noinst_HEADERS=
+
 
 SUBDIRS = \
-	libgearman \
-	libgearman-server \
+	. \
 	scripts \
 	support \
-	benchmark \
 	tests
 
+include benchmark/include.am
 include bin/include.am
 include examples/include.am
 include gearmand/include.am
+include libgearman/include.am
+include libgearman-server/include.am
 include docs/man_list
 
 EXTRA_DIST= \

benchmark/Makefile.am

@@ -1,19 +0,0 @@
-# Gearman server and library
-# Copyright (C) 2008 Brian Aker, Eric Day
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-
-LDADD= $(LTLIBUUID) $(LTLIBEVENT) $(top_builddir)/libgearman/libgearman.la
-
-noinst_PROGRAMS= \
-	blobslap_client \
-	blobslap_worker
-
-noinst_HEADERS= \
-	benchmark.h
-
-blobslap_client_SOURCES= blobslap_client.c benchmark.c
-
-blobslap_worker_SOURCES= blobslap_worker.c benchmark.c

benchmark/include.am

@@ -0,0 +1,28 @@
+# vim:ft=automake
+# Gearman server and library
+# Copyright (C) 2008 Brian Aker, Eric Day
+# Copyright (C) 2009 Brian Aker, Eric Day, Monty Taylor
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+#
+# Included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+
+noinst_PROGRAMS+= \
+	benchmark/blobslap_client \
+	benchmark/blobslap_worker
+
+noinst_HEADERS+= \
+	benchmark.h
+
+noinst_LTLIBRARIES+= benchmark/libbenchmark.la
+benchmark_libbenchmark_la_SOURCES= benchmark/benchmark.c
+
+benchmark_blobslap_client_SOURCES= benchmark/blobslap_client.c
+benchmark_blobslap_client_LDADD= benchmark/libbenchmark.la libgearman/libgearman.la
+
+benchmark_blobslap_worker_SOURCES= benchmark/blobslap_worker.c
+benchmark_blobslap_worker_LDADD= benchmark/libbenchmark.la libgearman/libgearman.la

configure.ac

@@ -63,12 +63,9 @@ AC_CHECK_HEADERS(sys/socket.h sys/types.h sys/utsname.h unistd.h strings.h)
 
 
 AC_CONFIG_FILES(Makefile
-                libgearman/Makefile
-                libgearman-server/Makefile
                 tests/Makefile
                 scripts/Makefile
                 support/Makefile
-                benchmark/Makefile
                 scripts/gearmand-init
                 scripts/gearmand.xml
                 scripts/gearmand

libgearman-server/Makefile.am

@@ -1,93 +0,0 @@
-# Gearman server and library
-# Copyright (C) 2008 Brian Aker, Eric Day
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-
-if HAVE_LIBDRIZZLE
-QUEUE_LIBDRIZZLE_H= queue_libdrizzle.h
-QUEUE_LIBDRIZZLE_C= queue_libdrizzle.c
-endif
-
-if HAVE_LIBMEMCACHED
-QUEUE_LIBMEMCACHED_H= queue_libmemcached.h
-QUEUE_LIBMEMCACHED_C= queue_libmemcached.c
-endif
-
-if HAVE_LIBSQLITE3
-QUEUE_LIBSQLITE3_H= queue_libsqlite3.h
-QUEUE_LIBSQLITE3_C= queue_libsqlite3.c
-endif
-
-if HAVE_LIBPQ
-QUEUE_LIBPQ_H= queue_libpq.h
-QUEUE_LIBPQ_C= queue_libpq.c
-endif
-
-lib_LTLIBRARIES= libgearman-server.la
-
-libgearman_serverincludedir= ${includedir}/libgearman-server
-
-dist_libgearman_serverinclude_HEADERS= \
-	client.h \
-	conf.h \
-	conf_module.h \
-	conn.h \
-	constants.h \
-	function.h \
-	job.h \
-	packet.h \
-	server.h \
-	structs.h \
-	thread.h \
-	worker.h \
-	$(QUEUE_LIBDRIZZLE_H) \
-	$(QUEUE_LIBMEMCACHED_H) \
-	$(QUEUE_LIBSQLITE3_H) \
-	$(QUEUE_LIBPQ_H) \
-	protocol_http.h \
-	gearmand.h \
-	gearmand_thread.h \
-	gearmand_con.h
-
-noinst_HEADERS= \
-	common.h
-
-libgearman_server_la_SOURCES= \
-	client.c \
-	conf.c \
-	conf_module.c \
-	conn.c \
-	function.c \
-	job.c \
-	packet.c \
-	server.c \
-	thread.c \
-	worker.c \
-	$(QUEUE_LIBDRIZZLE_C) \
-	$(QUEUE_LIBMEMCACHED_C) \
-	$(QUEUE_LIBSQLITE3_C) \
-	$(QUEUE_LIBPQ_C) \
-	protocol_http.c \
-	gearmand.c \
-	gearmand_thread.c \
-	gearmand_con.c
-
-libgearman_server_la_CFLAGS= \
-	${AM_CFLAGS} \
-	-DBUILDING_LIBGEARMAN
-
-libgearman_server_la_LDFLAGS= \
-	-version-info \
-	$(GEARMAN_SERVER_LIBRARY_VERSION)
-
-libgearman_server_la_LIBADD= \
-	$(top_builddir)/libgearman/libgearman.la \
-	$(LTLIBEVENT) \
-	$(LTLIBDRIZZLE) \
-	$(LTLIBMEMCACHED) \
-	$(LTLIBSQLITE3) \
-	$(LTLIBPQ)
-
-EXTRA_DIST= libgearman-server.ver

libgearman-server/include.am

@@ -0,0 +1,95 @@
+# vim:ft=automake
+# Gearman server and library
+# Copyright (C) 2008 Brian Aker, Eric Day
+# Copyright (C) 2009 Brian Aker, Eric Day, Monty Taylor
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+#
+# Included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+if HAVE_LIBDRIZZLE
+QUEUE_LIBDRIZZLE_H= libgearman-server/queue_libdrizzle.h
+QUEUE_LIBDRIZZLE_C= libgearman-server/queue_libdrizzle.c
+endif
+
+if HAVE_LIBMEMCACHED
+QUEUE_LIBMEMCACHED_H= libgearman-server/queue_libmemcached.h
+QUEUE_LIBMEMCACHED_C= libgearman-server/queue_libmemcached.c
+endif
+
+if HAVE_LIBSQLITE3
+QUEUE_LIBSQLITE3_H= libgearman-server/queue_libsqlite3.h
+QUEUE_LIBSQLITE3_C= libgearman-server/queue_libsqlite3.c
+endif
+
+if HAVE_LIBPQ
+QUEUE_LIBPQ_H= libgearman-server/queue_libpq.h
+QUEUE_LIBPQ_C= libgearman-server/queue_libpq.c
+endif
+
+lib_LTLIBRARIES+= libgearman-server/libgearman-server.la
+
+
+nobase_pkginclude_HEADERS += \
+	$(QUEUE_LIBDRIZZLE_H) \
+	$(QUEUE_LIBMEMCACHED_H) \
+	$(QUEUE_LIBPQ_H) \
+	$(QUEUE_LIBSQLITE3_H) \
+	libgearman-server/client.h \
+	libgearman-server/conf.h \
+	libgearman-server/conf_module.h \
+	libgearman-server/conn.h \
+	libgearman-server/constants.h \
+	libgearman-server/function.h \
+	libgearman-server/gearmand.h \
+	libgearman-server/gearmand_con.h \
+	libgearman-server/gearmand_thread.h \
+	libgearman-server/job.h \
+	libgearman-server/packet.h \
+	libgearman-server/protocol_http.h \
+	libgearman-server/server.h \
+	libgearman-server/structs.h \
+	libgearman-server/thread.h \
+	libgearman-server/worker.h
+
+noinst_HEADERS+= \
+	libgearman-server/common.h
+
+libgearman_server_libgearman_server_la_SOURCES= \
+	$(QUEUE_LIBDRIZZLE_C) \
+	$(QUEUE_LIBMEMCACHED_C) \
+	$(QUEUE_LIBPQ_C) \
+	$(QUEUE_LIBSQLITE3_C) \
+	libgearman-server/client.c \
+	libgearman-server/conf.c \
+	libgearman-server/conf_module.c \
+	libgearman-server/conn.c \
+	libgearman-server/function.c \
+	libgearman-server/gearmand.c \
+	libgearman-server/gearmand_con.c \
+	libgearman-server/gearmand_thread.c \
+	libgearman-server/job.c \
+	libgearman-server/packet.c \
+	libgearman-server/protocol_http.c \
+	libgearman-server/server.c \
+	libgearman-server/thread.c \
+	libgearman-server/worker.c
+
+libgearman_server_libgearman_server_la_CFLAGS= \
+	${AM_CFLAGS} \
+	-DBUILDING_LIBGEARMAN
+
+libgearman_server_libgearman_server_la_LDFLAGS= \
+	-version-info \
+	$(GEARMAN_SERVER_LIBRARY_VERSION)
+
+libgearman_server_libgearman_server_la_LIBADD= \
+	$(LTLIBDRIZZLE) \
+	$(LTLIBEVENT) \
+	$(LTLIBMEMCACHED) \
+	$(LTLIBPQ) \
+	$(LTLIBSQLITE3) \
+	libgearman/libgearman.la

libgearman/Makefile.am

@@ -1,48 +0,0 @@
-# Gearman server and library
-# Copyright (C) 2008 Brian Aker, Eric Day
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-
-lib_LTLIBRARIES= libgearman.la
-
-libgearmanincludedir= ${includedir}/libgearman
-
-dist_libgearmaninclude_HEADERS= \
-	client.h \
-	conn.h \
-	constants.h \
-	gearman.h \
-	job.h \
-	packet.h \
-	structs.h \
-	task.h \
-	visibility.h \
-	worker.h
-
-noinst_HEADERS= \
-	common.h \
-        gearman_local.h
-
-libgearman_la_SOURCES= \
-	client.c \
-	conn.c \
-	gearman.c \
-	job.c \
-	packet.c \
-	task.c \
-	worker.c
-
-libgearman_la_CFLAGS= \
-	${AM_CFLAGS} \
-	-DBUILDING_LIBGEARMAN
-
-libgearman_la_LDFLAGS= \
-	-version-info \
-	$(GEARMAN_LIBRARY_VERSION)
-
-libgearman_la_LIBADD= \
-	$(LTLIBUUID)
-
-EXTRA_DIST= libgearman.ver

libgearman/include.am

@@ -0,0 +1,50 @@
+# vim:ft=automake
+# Gearman server and library
+# Copyright (C) 2008 Brian Aker, Eric Day
+# Copyright (C) 2009 Brian Aker, Eric Day, Monty Taylor
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+#
+# Included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+lib_LTLIBRARIES+= libgearman/libgearman.la
+
+nobase_pkginclude_HEADERS += \
+	libgearman/client.h \
+	libgearman/conn.h \
+	libgearman/constants.h \
+	libgearman/gearman.h \
+	libgearman/job.h \
+	libgearman/packet.h \
+	libgearman/structs.h \
+	libgearman/task.h \
+	libgearman/visibility.h \
+	libgearman/worker.h
+
+noinst_HEADERS+= \
+	libgearman/common.h \
+	libgearman/gearman_local.h
+
+libgearman_libgearman_la_SOURCES= \
+	libgearman/client.c \
+	libgearman/conn.c \
+	libgearman/gearman.c \
+	libgearman/job.c \
+	libgearman/packet.c \
+	libgearman/task.c \
+	libgearman/worker.c
+
+libgearman_libgearman_la_CFLAGS= \
+	${AM_CFLAGS} \
+	-DBUILDING_LIBGEARMAN
+
+libgearman_libgearman_la_LDFLAGS= \
+	-version-info \
+	$(GEARMAN_LIBRARY_VERSION)
+
+libgearman_libgearman_la_LIBADD= \
+	$(LTLIBUUID)
+