commit 4abef11971b46dbde07cfc2a8ca213350fc4adce
author Elly Jones <ellyjones@chromium.org> Wed Jan 11 17:27:01 2012 -0500
committer Gerrit <chrome-bot@google.com> Thu Jan 19 14:29:20 2012 -0800
tree eb2357a70d8aa0ef000a4cfbc3c573fe9cc756b0
parent f53e106bbb4fddb58076630c4f0e8560a5770c93

[metrics] use libchromeos.pc

BUG=chromium-os:24959
TEST=build

Signed-off-by: Elly Jones <ellyjones@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/14012
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit 0ea8151d4628ccf500da82206384b8b492a95a0b)

Change-Id: I0c51d49cc7182a19b16d3cb123c43e29be890cbe
Reviewed-on: https://gerrit.chromium.org/gerrit/14505
Reviewed-by: Kees Cook <keescook@chromium.org>
Commit-Ready: Elly Jones <ellyjones@chromium.org>
Tested-by: Elly Jones <ellyjones@chromium.org>

metrics/Makefile

diff --git a/metrics/Makefile b/metrics/Makefile
index 072fb04..f2baa96 100644
--- a/metrics/Makefile
+++ b/metrics/Makefile
@@ -5,8 +5,10 @@
 # Makefile for metrics utilities -- library, client and daemon
 #
 
-CCONFIG = $(shell $(PKG_CONFIG) --cflags dbus-1 glib-2.0 dbus-glib-1)
-LDCONFIG = $(shell $(PKG_CONFIG) --libs dbus-1 glib-2.0 gthread-2.0 dbus-glib-1)
+PC_DEPS = dbus-1 glib-2.0 dbus-glib-1 libchrome libchromeos
+
+CCONFIG = $(shell $(PKG_CONFIG) --cflags $(PC_DEPS))
+LDCONFIG = $(shell $(PKG_CONFIG) --libs $(PC_DEPS) gthread-2.0)
 
 CXXFLAGS += -Wall -Werror -fPIC -fno-exceptions $(CCONFIG)
 
@@ -44,7 +46,7 @@
 
 TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0
 TESTTIMER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0
-DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags \
+DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lpthread -lgflags \
 		 -lglib-2.0 -lrootdev -lpolicy
 TESTDAEMON_LIBS = -lgmock -lgtest
 TESTLIB_LIBS = -lgtest -lgmock -lbase -lrt -lpthread -lglib-2.0