Makefile - Issue 3138013: [metrics] Fix tests after libbase roll broke them

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Makefile

Issue 3138013: [metrics] Fix tests after libbase roll broke them (Closed) Base URL: http://src.chromium.org/git/metrics.git

Patch Set: Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Makefile

diff --git a/Makefile b/Makefile

index f3dddd87329da664907ff67b482839aca593d66a..deb52949810aa01485305e460688d6f13d3bb928 100644

--- a/Makefile

+++ b/Makefile

@@ -39,10 +39,10 @@ LIB_OBJS = \

TESTLIB_OBJS = \

metrics_library_test.o

-TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread

-DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags

+TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0

+DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags -lglib-2.0

petkov 2010/08/12 19:45:39 Shouldn't glib-2.0 come from the LDCONFIG/PKG_CONF

Chris Masone 2010/08/12 19:47:51 huh. maybe we just needed it for the tests, yeah.

TESTDAEMON_LIBS = -lgmock -lgtest

-TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread

+TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread -lglib-2.0

all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON)

« no previous file with comments | « no previous file | no next file » | no next file with comments »