Index: Makefile |
diff --git a/Makefile b/Makefile |
index b649bea24981c003082d2d301ecf47262a7b49b3..5eefc0fd337ecac1cbbb7fac0de3dc87497d6547 100644 |
--- a/Makefile |
+++ b/Makefile |
@@ -3,27 +3,35 @@ |
# found in the LICENSE file. |
CRASH_REPORTER = crash_reporter |
-REPORTER_BINS = $(CRASH_REPORTER) |
+GET_PROXIES = get_proxies |
kmixter1
2011/03/24 17:24:34
Would add _BIN
Michael Krebs
2011/04/05 01:12:03
Done.
|
+REPORTER_BINS = $(CRASH_REPORTER) $(GET_PROXIES) |
CRASH_OBJS = \ |
crash_collector.o \ |
kernel_collector.o \ |
unclean_shutdown_collector.o \ |
user_collector.o |
+GET_PROXIES_OBJS = \ |
+ get_proxies.o |
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 gobject-2.0 dbus-1 dbus-glib-1) |
kmixter1
2011/03/24 17:24:34
prefer to not link gobject/dbus into crash reporte
Michael Krebs
2011/04/05 01:12:03
Done. I think this had been needed for update_eng
|
REPORTER_LIBS = $(COMMON_LIBS) -lmetrics |
+# MTEMP: GET_PROXIES_LIBS = $(COMMON_LIBS) -lprotobuf |
kmixter1
2011/03/24 17:24:34
remove?
Michael Krebs
2011/04/05 01:12:03
Done.
|
+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 gobject-2.0 dbus-1 dbus-glib-1) |
CXXFLAGS += -Wall -Werror |
@@ -32,6 +40,9 @@ all: $(REPORTER_BINS) |
$(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS) |
$(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@ |
+$(GET_PROXIES): $(GET_PROXIES_OBJS) |
+ $(CXX) $(CXXFLAGS) $^ $(GET_PROXIES_LIBS) -o $@ |
+ |
tests: $(TEST_BINS) |
%_test: %_test.o $(TEST_OBJS) |
@@ -41,4 +52,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) $(TEST_BINS) |