Makefile - Issue 6551022: Move lbase after lcrosapi.

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 6551022: Move lbase after lcrosapi. (Closed) Base URL: http://git.chromium.org/git/image-burner.git@master

Patch Set: 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

« 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 XXFLAGS ?= -Wall -Werror -g	5 XXFLAGS ?= -Wall -Werror -g

6 PKG_CONFIG ?= pkg-config	6 PKG_CONFIG ?= pkg-config

7	7

8 BASE_LIBS = -lbase -lpthread -lrt -lchromeos -lz -lcrosapi -ldl -lrootdev	8 BASE_LIBS = -lpthread -lrt -lchromeos -lz -lcrosapi -lbase -ldl -lrootdev

9 LIBS = $(BASE_LIBS)	9 LIBS = $(BASE_LIBS)

10 TEST_LIBS = $(BASE_LIBS)	10 TEST_LIBS = $(BASE_LIBS)

11 INCLUDE_DIRS = -I.. \	11 INCLUDE_DIRS = -I.. \

12 $(shell $(PKG_CONFIG) --cflags gobject-2.0 dbus-1 dbus-glib-1)	12 $(shell $(PKG_CONFIG) --cflags gobject-2.0 dbus-1 dbus-glib-1)

13 LIB_DIRS = $(shell $(PKG_CONFIG) --libs gobject-2.0 dbus-1 dbus-glib-1 )	13 LIB_DIRS = $(shell $(PKG_CONFIG) --libs gobject-2.0 dbus-1 dbus-glib-1 )

14	14

15 IMAGEBURN_COMMON_OBJS = image_burn_service.o image_burner.o	15 IMAGEBURN_COMMON_OBJS = image_burn_service.o image_burner.o

16	16

17 DBUS_SOURCE = image_burner.xml	17 DBUS_SOURCE = image_burner.xml

18 DBUS_SOURCE_BASENAME = image_burner	18 DBUS_SOURCE_BASENAME = image_burner

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 $(TESTER_OBJS) : $(DBUS_CLIENT) $(DBUS_MARSHAL_SOURCE)	62 $(TESTER_OBJS) : $(DBUS_CLIENT) $(DBUS_MARSHAL_SOURCE)

63	63

64 $(TESTER_BIN): $(TESTER_OBJS)	64 $(TESTER_BIN): $(TESTER_OBJS)

65 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) $(LIB_DIRS) $(TESTER_OBJS) \	65 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) $(LIB_DIRS) $(TESTER_OBJS) \

66 $(TEST_LIBS) $(LDFLAGS) -o $(TESTER_BIN)	66 $(TEST_LIBS) $(LDFLAGS) -o $(TESTER_BIN)

67	67

68 $(DBUS_CLIENT): $(DBUS_SOURCE) $(BINDINGS_DIR)	68 $(DBUS_CLIENT): $(DBUS_SOURCE) $(BINDINGS_DIR)

69 dbus-binding-tool --mode=glib-client \	69 dbus-binding-tool --mode=glib-client \

70 --prefix=$(DBUS_SOURCE_BASENAME) $(DBUS_SOURCE) > $(DBUS_CLIENT)	70 --prefix=$(DBUS_SOURCE_BASENAME) $(DBUS_SOURCE) > $(DBUS_CLIENT)

OLD	NEW