| OLD | NEW | 
|---|
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 # | 4 # | 
| 5 # Makefile for metrics utilities -- library, client and daemon | 5 # Makefile for metrics utilities -- library, client and daemon | 
| 6 # | 6 # | 
| 7 | 7 | 
| 8 CCONFIG = $(shell $(PKG_CONFIG) --cflags dbus-1 glib-2.0 dbus-glib-1) | 8 CCONFIG = $(shell $(PKG_CONFIG) --cflags dbus-1 glib-2.0 dbus-glib-1) | 
| 9 LDCONFIG = $(shell $(PKG_CONFIG) --libs dbus-1 glib-2.0 gthread-2.0 dbus-glib-1) | 9 LDCONFIG = $(shell $(PKG_CONFIG) --libs dbus-1 glib-2.0 gthread-2.0 dbus-glib-1) | 
| 10 | 10 | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 31         counter.o \ | 31         counter.o \ | 
| 32         metrics_daemon.o \ | 32         metrics_daemon.o \ | 
| 33         metrics_daemon_test.o | 33         metrics_daemon_test.o | 
| 34 LIB_OBJS = \ | 34 LIB_OBJS = \ | 
| 35         c_metrics_library.o \ | 35         c_metrics_library.o \ | 
| 36         metrics_library.o | 36         metrics_library.o | 
| 37 TESTLIB_OBJS = \ | 37 TESTLIB_OBJS = \ | 
| 38         metrics_library_test.o | 38         metrics_library_test.o | 
| 39 | 39 | 
| 40 TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0 | 40 TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0 | 
| 41 DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags -lglib-2.
    0 | 41 DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags \ | 
|  | 42 »       »        -lglib-2.0 -lrootdev | 
| 42 TESTDAEMON_LIBS = -lgmock -lgtest | 43 TESTDAEMON_LIBS = -lgmock -lgtest | 
| 43 TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread -lglib-2.0 | 44 TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread -lglib-2.0 | 
| 44 | 45 | 
| 45 all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON) | 46 all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON) | 
| 46 | 47 | 
| 47 tests: $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST) | 48 tests: $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST) | 
| 48 | 49 | 
| 49 $(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB) | 50 $(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB) | 
| 50         $(CXX) $(LDFLAGS) $^ -o $@ | 51         $(CXX) $(LDFLAGS) $^ -o $@ | 
| 51 | 52 | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 66 | 67 | 
| 67 $(LIB_TEST): $(TESTLIB_OBJS) $(SHAREDLIB) | 68 $(LIB_TEST): $(TESTLIB_OBJS) $(SHAREDLIB) | 
| 68         $(CXX) -o $@ $^ $(LDFLAGS) $(TESTLIB_LIBS) | 69         $(CXX) -o $@ $^ $(LDFLAGS) $(TESTLIB_LIBS) | 
| 69 | 70 | 
| 70 %.o: %.cc | 71 %.o: %.cc | 
| 71         $(CXX) $(CXXFLAGS) -c $< -o $@ | 72         $(CXX) $(CXXFLAGS) -c $< -o $@ | 
| 72 | 73 | 
| 73 clean: | 74 clean: | 
| 74         rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) *.o | 75         rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) *.o | 
| 75         rm -f $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST) | 76         rm -f $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST) | 
| OLD | NEW | 
|---|