| 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 DBUSXX_XML2CPP = dbusxx-xml2cpp |
| 14 | 14 |
| 15 INCLUDE_DIRS = -I.. -I$(OUT)include $(shell $(PKG_CONFIG) --cflags dbus-1 dbus-g
lib-1\ | 15 INCLUDE_DIRS = -I.. -I$(OUT) $(shell $(PKG_CONFIG) --cflags dbus-1 dbus-glib-1\ |
| 16 dbus-c++-1 glib-2.0) | 16 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 LIB_DIRS = $(shell $(PKG_CONFIG) --libs dbus-1 dbus-glib-1 dbus-c++-1 glib-2.0) |
| 18 | 18 |
| 19 CFLAGS := -Iinclude $(CFLAGS) | 19 CFLAGS := -Iinclude $(CFLAGS) |
| 20 CXXFLAGS := -Iinclude -I../ $(INCLUDE_DIRS) $(CXXFLAGS) | 20 CXXFLAGS := -Iinclude -I../ $(INCLUDE_DIRS) $(CXXFLAGS) |
| 21 LDFLAGS += -lbase -lgflags -lmetrics -ludev $(LIB_DIRS) | 21 LDFLAGS += -lbase -lchromeos -lgflags -lmetrics -ludev $(LIB_DIRS) |
| 22 | 22 |
| 23 $(OUT)include/cros-disks-server.h: cros-disks.xml | 23 cros-disks-server.h: cros-disks.xml |
| 24 » mkdir -p $(OUT)include | |
| 25 $(DBUSXX_XML2CPP) cros-disks.xml --adaptor=$@ | 24 $(DBUSXX_XML2CPP) cros-disks.xml --adaptor=$@ |
| 26 RM_ON_CLEAN += $(OUT)include/cros-disks-server.h | 25 RM_ON_CLEAN += cros-disks-server.h |
| 27 | 26 |
| 28 $(OUT)disks: $(filter-out %_testrunner.o %_unittest.o,$(C_OBJECTS)) \ | 27 $(OUT)disks: $(filter-out %_testrunner.o %_unittest.o,$(CXX_OBJECTS)) \ |
| 29 $(OUT)include/cros-disks-server.h \ | 28 » » cros-disks-server.h |
| 30 $(CXX_OBJECTS) | |
| 31 $(call cxx_binary) | 29 $(call cxx_binary) |
| 32 all: $(OUT)disks | 30 RM_ON_CLEAN += $(OUT)disks |
| 31 |
| 32 $(OUT)disks_testrunner: $(filter-out %main.o,$(CXX_OBJECTS)) \ |
| 33 » » cros-disks-server.h |
| 34 » $(call cxx_binary, -lgtest -lgmock) |
| 33 RM_ON_CLEAN += $(OUT)disks | 35 RM_ON_CLEAN += $(OUT)disks |
| 34 | 36 |
| 35 # Some shortcuts | 37 # Some shortcuts |
| 36 disks: $(OUT)disks | 38 all: disks |
| 37 dbus-headers: $(OUT)include/cros-disks-server.h | 39 disks: dbus-headers |
| 40 » make $(OUT)disks |
| 41 dbus-headers: cros-disks-server.h |
| 42 tests: dbus-headers |
| 43 » make $(OUT)disks_testrunner |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6838011:
adds a signal, fixes a crash, adds syslogging, and marshals disks to d-bus (Closed)
Base URL: ssh://gitrw.chromium.org:9222/cros-disks.git@master