| 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 CRASH_REPORTER = crash_reporter |   5 CRASH_REPORTER = crash_reporter | 
|   6 REPORTER_BINS = $(CRASH_REPORTER) |   6 LIST_PROXIES_BIN = list_proxies | 
 |   7 REPORTER_BINS = $(CRASH_REPORTER) $(LIST_PROXIES_BIN) | 
|   7 CRASH_OBJS = \ |   8 CRASH_OBJS = \ | 
|   8         crash_collector.o \ |   9         crash_collector.o \ | 
|   9         kernel_collector.o \ |  10         kernel_collector.o \ | 
|  10         unclean_shutdown_collector.o \ |  11         unclean_shutdown_collector.o \ | 
|  11         user_collector.o |  12         user_collector.o | 
 |  13 LIST_PROXIES_OBJS = list_proxies.o | 
 |  14 LIST_PROXIES_PKGS = dbus-1 dbus-glib-1 | 
|  12 TEST_OBJS = $(CRASH_OBJS) |  15 TEST_OBJS = $(CRASH_OBJS) | 
|  13 TEST_BINS = \ |  16 TEST_BINS = \ | 
|  14         crash_collector_test \ |  17         crash_collector_test \ | 
|  15         kernel_collector_test \ |  18         kernel_collector_test \ | 
|  16         unclean_shutdown_collector_test \ |  19         unclean_shutdown_collector_test \ | 
|  17         user_collector_test |  20         user_collector_test | 
|  18  |  21  | 
|  19 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp) |  22 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp) | 
|  20  |  23  | 
|  21 # -lglib-2.0 is needed by libbase.a now. |  24 # -lglib-2.0 is needed by libbase.a now. | 
|  22 COMMON_LIBS = -lchromeos -lbase -lpthread -lglib-2.0 -lgflags -lrt $(LDCONFIG) |  25 COMMON_LIBS = -lchromeos -lbase -lgflags $(LDCONFIG) \ | 
 |  26 »       $(shell $(PKG_CONFIG) --libs glib-2.0 $(LIST_PROXIES_PKGS)) | 
|  23 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics |  27 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics | 
 |  28 LIST_PROXIES_LIBS = $(COMMON_LIBS) | 
|  24  |  29  | 
|  25 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock |  30 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock | 
|  26 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad |  31 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad \ | 
 |  32 »       $(shell $(PKG_CONFIG) --cflags glib-2.0 $(LIST_PROXIES_PKGS)) | 
|  27  |  33  | 
|  28 CXXFLAGS += -Wall -Werror |  34 CXXFLAGS += -Wall -Werror | 
|  29  |  35  | 
|  30 all: $(REPORTER_BINS) |  36 all: $(REPORTER_BINS) | 
|  31  |  37  | 
|  32 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS) |  38 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS) | 
|  33         $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@ |  39         $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@ | 
|  34  |  40  | 
 |  41 $(LIST_PROXIES_BIN): $(LIST_PROXIES_OBJS) | 
 |  42         $(CXX) $(CXXFLAGS) $^ $(LIST_PROXIES_LIBS) -o $@ | 
 |  43  | 
|  35 tests: $(TEST_BINS) |  44 tests: $(TEST_BINS) | 
|  36  |  45  | 
|  37 %_test: %_test.o $(TEST_OBJS) |  46 %_test: %_test.o $(TEST_OBJS) | 
|  38         $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@ |  47         $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@ | 
|  39  |  48  | 
|  40 .cc.o: |  49 .cc.o: | 
|  41         $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@ |  50         $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@ | 
|  42  |  51  | 
|  43 clean: |  52 clean: | 
|  44 »       rm -rf *.o $(CRASH_BIN) $(TEST_BINS) |  53 »       rm -rf *.o $(CRASH_BIN) $(LIST_PROXIES_BIN) $(TEST_BINS) | 
| OLD | NEW |