Makefile - Issue 6824032: First batch of cros-disk changes

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 6824032: First batch of cros-disk changes (Closed) Base URL: ssh://gitrw.chromium.org:9222/cros-disks.git@master

Patch Set: adds set_ and removes j's Created 9 years, 8 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) 2011 The Chromium OS Authors. All rights reserved.	1 # Copyright (C) 2011 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.makefile file.	3 # found in the LICENSE.makefile file.

4 #	4 #

5 # Top-level Makefile for cros-disks.	5 # Top-level Makefile for cros-disks.

6	6

7 # Pull in chromium os defaults	7 # Pull in chromium os defaults

8 # TODO(rtc): This verison of common.mk came from drewry@, we should find	8 # TODO(rtc): This verison of common.mk came from drewry@, we should find

9 # a way to share the file rather than copying it.	9 # a way to share the file rather than copying it.

10 include common.mk	10 include common.mk

11	11

12 PKG_CONFIG ?= pkg-config	12 PKG_CONFIG ?= pkg-config

	13 DBUSXX_XML2CPP = dbusxx-xml2cpp

13	14

14 INCLUDE_DIRS = -I.. $(shell $(PKG_CONFIG) --cflags dbus-1 dbus-glib-1\	15 INCLUDE_DIRS = -I.. -I$(OUT)include $(shell $(PKG_CONFIG) --cflags dbus-1 dbus-g lib-1\

15 dbus-c++-1 glib-2.0)	16 dbus-c++-1 glib-2.0)

16 LIB_DIRS = $(shell $(PKG_CONFIG) --libs dbus-1 dbus-glib-1 dbus-c++-1 glib-2.0)	17 LIB_DIRS = $(shell $(PKG_CONFIG) --libs dbus-1 dbus-glib-1 dbus-c++-1 glib-2.0)

17	18

18 CFLAGS := -Iinclude $(CFLAGS)	19 CFLAGS := -Iinclude $(CFLAGS)

19 CXXFLAGS := -Iinclude -I../ $(INCLUDE_DIRS) $(CXXFLAGS)	20 CXXFLAGS := -Iinclude -I../ $(INCLUDE_DIRS) $(CXXFLAGS)

20 LDFLAGS += -lbase -lgflags -lmetrics $(LIB_DIRS)	21 LDFLAGS += -lbase -lgflags -lmetrics -ludev $(LIB_DIRS)

21	22

22 disks: $(OUT)disks	23 $(OUT)include/cros-disks-server.h: cros-disks.xml

	24 » mkdir -p $(OUT)include

	25 » $(DBUSXX_XML2CPP) cros-disks.xml --adaptor=$@

	26 RM_ON_CLEAN += $(OUT)include/cros-disks-server.h

23	27

24 $(OUT)disks: $(filter-out %_testrunner.o %_unittest.o,$(C_OBJECTS)) \	28 $(OUT)disks: $(filter-out %_testrunner.o %_unittest.o,$(C_OBJECTS)) \

	29 $(OUT)include/cros-disks-server.h \

25 $(CXX_OBJECTS)	30 $(CXX_OBJECTS)

26 $(call cxx_binary)	31 $(call cxx_binary)

27 all: $(OUT)disks	32 all: $(OUT)disks

28 RM_ON_CLEAN += $(OUT)disks	33 RM_ON_CLEAN += $(OUT)disks

	34

	35 # Some shortcuts

	36 disks: $(OUT)disks

	37 dbus-headers: $(OUT)include/cros-disks-server.h

OLD	NEW

« no previous file with comments | « no previous file | common.mk » ('j') | no next file with comments »