Makefile - Issue 6517001: crash-reporter: Use standard logging and new libchromeos Process code

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 6517001: crash-reporter: Use standard logging and new libchromeos Process code (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crash-reporter.git@master

Patch Set: sync Created 9 years, 10 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 | Annotate | Revision Log

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 = \	7 CRASH_OBJS = \

8 crash_collector.o \	8 crash_collector.o \

9 kernel_collector.o \	9 kernel_collector.o \

10 system_logging.o \

11 unclean_shutdown_collector.o \	10 unclean_shutdown_collector.o \

12 user_collector.o	11 user_collector.o

13 TEST_OBJS = $(CRASH_OBJS) system_logging_mock.o	12 TEST_OBJS = $(CRASH_OBJS)

14 TEST_BINS = \	13 TEST_BINS = \

15 crash_collector_test \	14 crash_collector_test \

16 kernel_collector_test \	15 kernel_collector_test \

17 unclean_shutdown_collector_test \	16 unclean_shutdown_collector_test \

18 user_collector_test	17 user_collector_test

19	18

20 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp)	19 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp)

21	20

22 # -lglib-2.0 is needed by libbase.a now.	21 # -lglib-2.0 is needed by libbase.a now.

23 COMMON_LIBS = -lbase -lpthread -lglib-2.0 -lgflags -lrt $(LDCONFIG)	22 COMMON_LIBS = -lbase -lchromeos -lpthread -lglib-2.0 -lgflags -lrt $(LDCONFIG)
	petkov 2011/02/25 19:28:34 Do you need to add a dependency to libchromeos to Do you need to add a dependency to libchromeos to the crash-reporter ebuild first?
24 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics	23 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics

25	24

26 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock	25 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock

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

28	27

29 CXXFLAGS += -Wall -Werror	28 CXXFLAGS += -Wall -Werror

30	29

31 all: $(REPORTER_BINS)	30 all: $(REPORTER_BINS)

32	31

33 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS)	32 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS)

34 $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@	33 $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@

35	34

36 tests: $(TEST_BINS)	35 tests: $(TEST_BINS)

37	36

38 %_test: %_test.o $(TEST_OBJS)	37 %_test: %_test.o $(TEST_OBJS)

39 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@	38 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@

40	39

41 .cc.o:	40 .cc.o:

42 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@	41 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@

43	42

44 clean:	43 clean:

45 rm -rf *.o $(CRASH_BIN) $(TEST_BINS)	44 rm -rf *.o $(CRASH_BIN) $(TEST_BINS)

OLD	NEW

« no previous file with comments | « no previous file | crash_collector.h » ('j') | no next file with comments »