Merge lp:~vjsamuel/gearmand/fix-bug-868883 into lp:gearmand/1.0

Proposed by Vijay Samuel
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~vjsamuel/gearmand/fix-bug-868883
Merge into: lp:gearmand/1.0
Diff against target: 15 lines (+4/-1)
1 file modified
tests/include.am (+4/-1)
To merge this branch: bzr merge lp:~vjsamuel/gearmand/fix-bug-868883
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+78350@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/include.am'
2--- tests/include.am 2011-08-16 22:53:06 +0000
3+++ tests/include.am 2011-10-06 05:07:24 +0000
4@@ -28,7 +28,10 @@
5 noinst_LTLIBRARIES+= tests/libstartworker.la
6 tests_libstartworker_la_CXXFLAGS=
7 tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
8-tests_libstartworker_la_LIBADD= $(PTHREAD_LIBS)
9+tests_libstartworker_la_LIBADD= \
10+ $(PTHREAD_LIBS) \
11+ $(LTLIBUUID)
12+
13 tests_libstartworker_la_SOURCES= tests/start_worker.cc
14 tests_libstartworker_la_SOURCES+= util/instance.cc
15 tests_libstartworker_la_SOURCES+= util/operation.cc

Subscribers

People subscribed via source and target branches