Makefile - Issue 2944003: Fix crash-reporter test build

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Makefile

Issue 2944003: Fix crash-reporter test build (Closed) Base URL: ssh://git@chromiumos-git//crash-reporter.git

Patch Set: Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

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 REPORTER_BINS = $(CRASH_REPORTER)

7 CRASH_OBJS = system_logging.o user_collector.o	7 CRASH_OBJS = system_logging.o user_collector.o

8 TEST_OBJS = $(CRASH_OBJS) system_logging_mock.o	8 TEST_OBJS = $(CRASH_OBJS) system_logging_mock.o

9 TEST_BINS = user_collector_test	9 TEST_BINS = user_collector_test

10	10

11 COMMON_LIBS = -lbase -lpthread -lgflags -lrt	11 COMMON_LIBS = -lbase -lpthread -lgflags -lrt

12 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics	12 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics

13	13

14 TEST_LIBS = $(LIBS) -lgtest -lgmock	14 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock

15 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad	15 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad

16	16

17 CXXFLAGS += -Wall -Werror	17 CXXFLAGS += -Wall -Werror

18	18

19 all: $(REPORTER_BINS)	19 all: $(REPORTER_BINS)

20	20

21 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS)	21 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS)

22 $(CXX) $(CXXFLAGS) $^ -lcrash $(REPORTER_LIBS) -o $@	22 $(CXX) $(CXXFLAGS) $^ -lcrash $(REPORTER_LIBS) -o $@

23	23

24 tests: $(TEST_BINS)	24 tests: $(TEST_BINS)

25	25

26 user_collector_test: user_collector_test.o $(TEST_OBJS)	26 user_collector_test: user_collector_test.o $(TEST_OBJS)

27 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@	27 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@

28	28

29 .cc.o:	29 .cc.o:

30 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@	30 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@

31	31

32 clean:	32 clean:

33 rm -rf *.o $(CRASH_BIN) $(TEST_BINS)	33 rm -rf *.o $(CRASH_BIN) $(TEST_BINS)

OLD	NEW