Fix for lp:948312

benchmark/include.am

@@ -24,17 +24,22 @@ benchmark_libbenchmark_la_SOURCES= benchmark/benchmark.cc
 benchmark_blobslap_client_SOURCES= benchmark/blobslap_client.cc
 benchmark_blobslap_client_LDADD= benchmark/libbenchmark.la libgearman/libgearman.la
 
-benchmark_blobslap_worker_SOURCES= \
-				   benchmark/blobslap_worker.cc \
-				   util/daemon.cc \
-				   util/logfile.cc \
-				   util/pidfile.cc \
-				   util/signal.cc
-benchmark_blobslap_worker_CXXFLAGS= $(PTHREAD_CFLAGS)
-benchmark_blobslap_worker_LDADD= \
-				 $(BOOST_PROGRAM_OPTIONS_LIBS) \
-				 benchmark/libbenchmark.la \
-				 libgearman/libgearman.la
+benchmark_blobslap_worker_CXXFLAGS=
+benchmark_blobslap_worker_LDADD=
+benchmark_blobslap_worker_SOURCES=
+benchmark_blobslap_worker_SOURCES+= \
+				    benchmark/blobslap_worker.cc \
+				    util/daemon.cc \
+				    util/logfile.cc \
+				    util/pidfile.cc \
+				    util/signal.cc
+benchmark_blobslap_worker_CXXFLAGS+= $(PTHREAD_CFLAGS)
+benchmark_blobslap_worker_CXXFLAGS+= $(BOOST_CPPFLAGS)
+benchmark_blobslap_worker_LDADD+= \
+				  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
+				  $(BOOST_PROGRAM_OPTIONS_LIBS) \
+				  benchmark/libbenchmark.la \
+				  libgearman/libgearman.la
 benchmark_blobslap_worker_LDADD+= $(PTHREAD_LIBS)
 
 GEARMAND_BE_PIDFILE = ${abs_top_builddir}/tests/var/tmp/Begearmand.pid

examples/include.am

@@ -12,6 +12,7 @@
 # All paths should be given relative to the root
 
 EXAMPLES_LDADD= \
+		$(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
 		$(BOOST_PROGRAM_OPTIONS_LIBS) \
 		libgearman/libgearman.la
 

gearmand/include.am

@@ -16,14 +16,17 @@ noinst_HEADERS+= gearmand/log.hpp
 sbin_PROGRAMS+= gearmand/gearmand
 
 gearmand_gearmand_LDADD=
+gearmand_gearmand_CXXFLAGS=
+gearmand_gearmand_DEPENDENCIES=
+gearmand_gearmand_LDFLAGS=
+
 gearmand_gearmand_LDADD+= libgearman-server/libgearman-server.la
 
-gearmand_gearmand_DEPENDENCIES=
 gearmand_gearmand_DEPENDENCIES+= libgearman-server/libgearman-server.la
 
-gearmand_gearmand_LDFLAGS= $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+gearmand_gearmand_LDFLAGS+= $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 
-gearmand_gearmand_CXXFLAGS= $(BOOST_CXXFLAGS)
+gearmand_gearmand_CXXFLAGS+= $(BOOST_CPPFLAGS)
 
 gearmand_gearmand_SOURCES= \
 			   gearmand/gearmand.cc \

libgearman-server/include.am

@@ -81,6 +81,7 @@ libgearman_server_libgearman_server_la_CFLAGS+= $(LIBEVENT_CPPFLAGS)
 libgearman_server_libgearman_server_la_CFLAGS+= $(PTHREAD_CFLAGS)
 libgearman_server_libgearman_server_la_CFLAGS+= -DBUILDING_LIBGEARMAN
 
+libgearman_server_libgearman_server_la_CXXFLAGS+= $(BOOST_CPPFLAGS)
 libgearman_server_libgearman_server_la_CXXFLAGS+= $(LIBEVENT_CPPFLAGS)
 libgearman_server_libgearman_server_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
 libgearman_server_libgearman_server_la_CXXFLAGS+= -DBUILDING_LIBGEARMAN

tests/include.am

@@ -29,9 +29,11 @@ noinst_HEADERS+= \
 
 noinst_LTLIBRARIES+= tests/libstartworker.la
 tests_libstartworker_la_CXXFLAGS=
+tests_libstartworker_la_LIBADD=
 tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
 tests_libstartworker_la_CXXFLAGS+= $(BOOST_CPPFLAGS)
-tests_libstartworker_la_LIBADD= $(PTHREAD_LIBS)
+tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LDFLAGS)
+tests_libstartworker_la_LIBADD+= $(PTHREAD_LIBS)
 tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LIBS)
 tests_libstartworker_la_LIBADD+= libgearman/libgearman.la
 tests_libstartworker_la_SOURCES= tests/start_worker.cc

tests/libgearman-1.0/include.am

@@ -5,20 +5,24 @@ LIBGEARMAN_1_0_CLIENT_LDADD= \
 			     libtest/libtest.la \
 			     tests/libstartworker.la
 
-tests_libgearman_1_0_client_test_SOURCES= \
-					  tests/libgearman-1.0/client_test.cc \
-					  tests/libgearman-1.0/do.cc \
-					  tests/libgearman-1.0/do_background.cc \
-					  tests/libgearman-1.0/execute.cc \
-					  tests/libgearman-1.0/gearman_client_do_job_handle.cc \
-					  tests/libgearman-1.0/gearman_execute_partition.cc \
-					  tests/libgearman-1.0/limits.cc \
-					  tests/libgearman-1.0/protocol.cc \
-					  tests/libgearman-1.0/server_options.cc \
-					  tests/libgearman-1.0/task.cc \
-					  tests/libgearman-1.0/unique.cc \
-					  tests/libgearman-1.0/workers.cc \
-					  tests/libgearman-1.0/workers_v1.cc
+tests_libgearman_1_0_client_test_CXXFLAGS=
+tests_libgearman_1_0_client_test_SOURCES=
+
+tests_libgearman_1_0_client_test_CXXFLAGS+= $(BOOST_CPPFLAGS)
+tests_libgearman_1_0_client_test_SOURCES+= \
+					   tests/libgearman-1.0/client_test.cc \
+					   tests/libgearman-1.0/do.cc \
+					   tests/libgearman-1.0/do_background.cc \
+					   tests/libgearman-1.0/execute.cc \
+					   tests/libgearman-1.0/gearman_client_do_job_handle.cc \
+					   tests/libgearman-1.0/gearman_execute_partition.cc \
+					   tests/libgearman-1.0/limits.cc \
+					   tests/libgearman-1.0/protocol.cc \
+					   tests/libgearman-1.0/server_options.cc \
+					   tests/libgearman-1.0/task.cc \
+					   tests/libgearman-1.0/unique.cc \
+					   tests/libgearman-1.0/workers.cc \
+					   tests/libgearman-1.0/workers_v1.cc
 tests_libgearman_1_0_client_test_DEPENDENCIES= ${LIBGEARMAN_1_0_CLIENT_LDADD} gearmand/gearmand
 tests_libgearman_1_0_client_test_LDADD= ${LIBGEARMAN_1_0_CLIENT_LDADD}
 check_PROGRAMS+=tests/libgearman-1.0/client_test