[metrics] Fix tests after libbase roll broke them

Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # 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)
 
@@ skipping 21 matching lines @@
 TESTDAEMON_OBJS = \
         counter.o \
         metrics_daemon.o \
         metrics_daemon_test.o
 LIB_OBJS = \
         c_metrics_library.o \
         metrics_library.o
 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_CONFIG above?

Also, 80 chars, if really needed.

[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)
 
 tests: $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST)
 
 $(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB)
         $(CXX) $(LDFLAGS) $^ -o $@
 
 $(COUNTER_TEST): $(TESTCOUNTER_OBJS)
         $(CXX) -o $@ $^ $(TESTCOUNTER_LIBS)
@@ skipping 12 matching lines @@
 
 $(LIB_TEST): $(TESTLIB_OBJS) $(SHAREDLIB)
         $(CXX) -o $@ $^ $(LDFLAGS) $(TESTLIB_LIBS)
 
 %.o: %.cc
         $(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
         rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) *.o
         rm -f $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST)