| Index: Makefile
|
| diff --git a/Makefile b/Makefile
|
| index b649bea24981c003082d2d301ecf47262a7b49b3..70374da7582cac0bb317f36531bd4d4f0851d5aa 100644
|
| --- a/Makefile
|
| +++ b/Makefile
|
| @@ -3,27 +3,34 @@
|
| # found in the LICENSE file.
|
|
|
| CRASH_REPORTER = crash_reporter
|
| -REPORTER_BINS = $(CRASH_REPORTER)
|
| +GET_PROXIES_BIN = get_proxies
|
| +REPORTER_BINS = $(CRASH_REPORTER) $(GET_PROXIES_BIN)
|
| CRASH_OBJS = \
|
| crash_collector.o \
|
| kernel_collector.o \
|
| unclean_shutdown_collector.o \
|
| user_collector.o
|
| +GET_PROXIES_OBJS = get_proxies.o
|
| +GET_PROXIES_PKGS = dbus-1 dbus-glib-1
|
| TEST_OBJS = $(CRASH_OBJS)
|
| TEST_BINS = \
|
| crash_collector_test \
|
| kernel_collector_test \
|
| unclean_shutdown_collector_test \
|
| - user_collector_test
|
| + user_collector_test \
|
| + get_proxies_test
|
|
|
| LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp)
|
|
|
| # -lglib-2.0 is needed by libbase.a now.
|
| -COMMON_LIBS = -lchromeos -lbase -lpthread -lglib-2.0 -lgflags -lrt $(LDCONFIG)
|
| +COMMON_LIBS = -lchromeos -lbase -lgflags $(LDCONFIG) \
|
| + $(shell $(PKG_CONFIG) --libs glib-2.0 $(GET_PROXIES_PKGS))
|
| REPORTER_LIBS = $(COMMON_LIBS) -lmetrics
|
| +GET_PROXIES_LIBS = $(COMMON_LIBS)
|
|
|
| TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock
|
| -INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad
|
| +INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad \
|
| + $(shell $(PKG_CONFIG) --cflags glib-2.0 $(GET_PROXIES_PKGS))
|
|
|
| CXXFLAGS += -Wall -Werror
|
|
|
| @@ -32,6 +39,9 @@ all: $(REPORTER_BINS)
|
| $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS)
|
| $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@
|
|
|
| +$(GET_PROXIES_BIN): $(GET_PROXIES_OBJS)
|
| + $(CXX) $(CXXFLAGS) $^ $(GET_PROXIES_LIBS) -o $@
|
| +
|
| tests: $(TEST_BINS)
|
|
|
| %_test: %_test.o $(TEST_OBJS)
|
| @@ -41,4 +51,4 @@ tests: $(TEST_BINS)
|
| $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@
|
|
|
| clean:
|
| - rm -rf *.o $(CRASH_BIN) $(TEST_BINS)
|
| + rm -rf *.o $(CRASH_BIN) $(GET_PROXIES_BIN) $(TEST_BINS)
|
|
|