Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
ee20477d
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ee20477d
编写于
5月 22, 2012
作者:
P
Paolo Bonzini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build: move fsdev/ objects to nested Makefile.objs
Signed-off-by:
N
Paolo Bonzini
<
pbonzini@redhat.com
>
上级
d8469de6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
7 deletion
+15
-7
Makefile
Makefile
+1
-1
Makefile.objs
Makefile.objs
+5
-6
fsdev/Makefile.objs
fsdev/Makefile.objs
+9
-0
未找到文件。
Makefile
浏览文件 @
ee20477d
...
@@ -100,7 +100,7 @@ endif
...
@@ -100,7 +100,7 @@ endif
subdir-libcacard
:
$(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
subdir-libcacard
:
$(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
$(filter %-softmmu,$(SUBDIR_RULES))
:
$(universal-obj-y) $(trace-obj-y) $(common-obj-y) subdir-libdis
$(filter %-softmmu,$(SUBDIR_RULES))
:
$(universal-obj-y) $(trace-obj-y) $(common-obj-y)
$(extra-obj-y)
subdir-libdis
$(filter %-user,$(SUBDIR_RULES))
:
$(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
$(filter %-user,$(SUBDIR_RULES))
:
$(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
...
...
Makefile.objs
浏览文件 @
ee20477d
...
@@ -51,11 +51,7 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
...
@@ -51,11 +51,7 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
# only pull in the actual virtio-9p device if we also enabled virtio.
# only pull in the actual virtio-9p device if we also enabled virtio.
CONFIG_REALLY_VIRTFS
=
y
CONFIG_REALLY_VIRTFS
=
y
fsdev-nested-y
=
qemu-fsdev.o virtio-9p-marshal.o
else
fsdev-nested-y
=
qemu-fsdev-dummy.o
endif
endif
fsdev-obj-$(CONFIG_VIRTFS)
+=
$(
addprefix
fsdev/,
$
(
fsdev-nested-y
))
######################################################################
######################################################################
# Target independent part of system emulation. The long term path is to
# Target independent part of system emulation. The long term path is to
...
@@ -65,12 +61,14 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
...
@@ -65,12 +61,14 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
common-obj-y
=
$
(
block-obj-y
)
blockdev.o
common-obj-y
=
$
(
block-obj-y
)
blockdev.o
common-obj-y
+=
net.o net/
common-obj-y
+=
net.o net/
common-obj-y
+=
qom/
common-obj-y
+=
qom/
common-obj-$(CONFIG_LINUX)
+=
$
(
fsdev-obj-
$(CONFIG_LINUX)
)
common-obj-y
+=
readline.o console.o cursor.o
common-obj-y
+=
readline.o console.o cursor.o
common-obj-y
+=
$
(
oslib-obj-y
)
common-obj-y
+=
$
(
oslib-obj-y
)
common-obj-$(CONFIG_WIN32)
+=
os-win32.o
common-obj-$(CONFIG_WIN32)
+=
os-win32.o
common-obj-$(CONFIG_POSIX)
+=
os-posix.o
common-obj-$(CONFIG_POSIX)
+=
os-posix.o
common-obj-$(CONFIG_LINUX)
+=
fsdev/
extra-obj-$(CONFIG_LINUX)
+=
fsdev/
common-obj-y
+=
tcg-runtime.o host-utils.o main-loop.o
common-obj-y
+=
tcg-runtime.o host-utils.o main-loop.o
common-obj-y
+=
irq.o input.o
common-obj-y
+=
irq.o input.o
common-obj-$(CONFIG_PTIMER)
+=
ptimer.o
common-obj-$(CONFIG_PTIMER)
+=
ptimer.o
...
@@ -442,5 +440,6 @@ nested-vars += \
...
@@ -442,5 +440,6 @@ nested-vars += \
block-obj-y
\
block-obj-y
\
qom-obj-y
\
qom-obj-y
\
user-obj-y
\
user-obj-y
\
common-obj-y
common-obj-y
\
extra-obj-y
dummy
:=
$(
call
unnest-vars
)
dummy
:=
$(
call
unnest-vars
)
fsdev/Makefile.objs
0 → 100644
浏览文件 @
ee20477d
ifeq
($(CONFIG_REALLY_VIRTFS),y)
common-obj-y
=
qemu-fsdev.o virtio-9p-marshal.o
# Toplevel always builds this; targets without virtio will put it in
# common-obj-y
extra-obj-y
=
qemu-fsdev-dummy.o
else
common-obj-y
=
qemu-fsdev-dummy.o
endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录