Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirror_resources
Qemu
提交
992aeb8e
Q
Qemu
项目概览
mirror_resources
/
Qemu
12 个月 前同步成功
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
Qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
992aeb8e
编写于
12月 21, 2012
作者:
P
Paolo Bonzini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libcacard: rewrite Makefile in non-recursive style
Signed-off-by:
N
Paolo Bonzini
<
pbonzini@redhat.com
>
上级
5018f1cc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
59 deletion
+20
-59
Makefile
Makefile
+9
-26
configure
configure
+1
-8
libcacard/Makefile
libcacard/Makefile
+10
-25
未找到文件。
Makefile
浏览文件 @
992aeb8e
...
...
@@ -104,6 +104,14 @@ defconfig:
-include
config-all-devices.mak
-include
config-all-disas.mak
ifneq
($(wildcard config-host.mak),)
include
$(SRC_PATH)/Makefile.objs
include
$(SRC_PATH)/tests/Makefile
endif
ifeq
($(CONFIG_SMARTCARD_NSS),y)
include
$(SRC_PATH)/libcacard/Makefile
endif
all
:
$(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
config-host.h
:
config-host.h-timestamp
...
...
@@ -116,12 +124,6 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
subdir-%
:
$(
call
quiet-command,
$(MAKE)
$(SUBDIR_MAKEFLAGS)
-C
$*
V
=
"
$(V)
"
TARGET_DIR
=
"
$*
/"
all,
)
ifneq
($(wildcard config-host.mak),)
include
$(SRC_PATH)/Makefile.objs
endif
subdir-libcacard
:
$(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
subdir-pixman
:
pixman/Makefile
$(
call
quiet-command,
$(MAKE)
$(SUBDIR_MAKEFLAGS)
-C
pixman
V
=
"
$(V)
"
all,
)
...
...
@@ -157,18 +159,6 @@ version-obj-$(CONFIG_WIN32) += version.o
libqemustub.a
:
$(stub-obj-y)
######################################################################
# Support building shared library libcacard
ifeq
($(CONFIG_SMARTCARD_NSS),y)
.PHONY
:
libcacard.la install-libcacard
libcacard.la
:
$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
$(
call
quiet-command,
$(MAKE)
$(SUBDIR_MAKEFLAGS)
-C
libcacard
V
=
"
$(V)
"
TARGET_DIR
=
"
$*
/"
libcacard.la,
)
install-libcacard
:
libcacard.la
$(
call
quiet-command,
$(MAKE)
$(SUBDIR_MAKEFLAGS)
-C
libcacard
V
=
"
$(V)
"
TARGET_DIR
=
"
$*
/"
install-libcacard,
)
endif
######################################################################
qemu-img.o
:
qemu-img-cmds.h
...
...
@@ -183,10 +173,6 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a
qemu-bridge-helper$(EXESUF)
:
qemu-bridge-helper.o
vscclient$(EXESUF)
:
LIBS += $(libcacard_libs)
vscclient$(EXESUF)
:
$(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a
$(
call
LINK,
$^
)
fsdev/virtfs-proxy-helper$(EXESUF)
:
fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
fsdev/virtfs-proxy-helper$(EXESUF)
:
LIBS += -lcap
...
...
@@ -198,10 +184,6 @@ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
gen-out-type
=
$(
subst
.,-,
$(
suffix
$@
))
ifneq
($(wildcard config-host.mak),)
include
$(SRC_PATH)/tests/Makefile
endif
qapi-py
=
$(SRC_PATH)
/scripts/qapi.py
$(SRC_PATH)
/scripts/ordereddict.py
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h
:
\
...
...
@@ -236,6 +218,7 @@ clean:
rm
-f
qemu-options.def
find
.
-name
'*.[od]'
-type
f
-exec
rm
-f
{}
+
rm
-f
*.a
*.lo
$(TOOLS)
$(HELPERS-y)
qemu-ga
TAGS
cscope.*
*.pod
*~
*/*~
rm
-f
*.la
rm
-Rf
.libs
rm
-f
qemu-img-cmds.h
@
# May not be present in GENERATED_HEADERS
...
...
configure
浏览文件 @
992aeb8e
...
...
@@ -3191,9 +3191,6 @@ if test "$softmmu" = yes ; then
tools
=
"qemu-ga
\$
(EXESUF)
$tools
"
fi
fi
if
test
"
$smartcard_nss
"
=
"yes"
;
then
tools
=
"vscclient
\$
(EXESUF)
$tools
"
fi
fi
# Mac OS X ships with a broken assembler
...
...
@@ -4039,9 +4036,6 @@ fi
if
test
"
$target_softmmu
"
=
"yes"
;
then
echo
"CONFIG_SOFTMMU=y"
>>
$config_target_mak
echo
"LIBS+=
$libs_softmmu
$target_libs_softmmu
"
>>
$config_target_mak
if
test
"
$smartcard_nss
"
=
"yes"
;
then
echo
"subdir-
$target
: subdir-libcacard"
>>
$config_host_mak
fi
case
"
$target_arch2
"
in
i386|x86_64
)
echo
"CONFIG_HAVE_CORE_DUMP=y"
>>
$config_target_mak
...
...
@@ -4242,10 +4236,9 @@ DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32"
DIRS
=
"
$DIRS
pc-bios/optionrom pc-bios/spapr-rtas"
DIRS
=
"
$DIRS
roms/seabios roms/vgabios"
DIRS
=
"
$DIRS
qapi-generated"
DIRS
=
"
$DIRS
libcacard libcacard/libcacard libcacard/trace"
FILES
=
"Makefile tests/tcg/Makefile qdict-test-data.txt"
FILES
=
"
$FILES
tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
FILES
=
"
$FILES
tests/tcg/lm32/Makefile
libcacard/Makefile
"
FILES
=
"
$FILES
tests/tcg/lm32/Makefile"
FILES
=
"
$FILES
pc-bios/optionrom/Makefile pc-bios/keymaps"
FILES
=
"
$FILES
pc-bios/spapr-rtas/Makefile"
FILES
=
"
$FILES
roms/seabios/Makefile roms/vgabios/Makefile"
...
...
libcacard/Makefile
浏览文件 @
992aeb8e
-include
../config-host.mak
-include
$(SRC_PATH)/rules.mak
-include
$(SRC_PATH)/Makefile.objs
libcacard_includedir
=
$(includedir)
/cacard
$(call
set-vpath,
$(SRC_PATH)
)
TOOLS
+=
vscclient
$(EXESUF
)
# objects linked into a shared library, built with libtool with -fPIC if required
libcacard-obj-y
=
$
(
oslib-obj-y
)
error.o
$
(
trace-obj-y
)
$
(
stub-obj-y
)
$
(
libcacard-y
)
...
...
@@ -13,20 +9,12 @@ libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))
# libtool will build the .o files, too
$(libcacard-obj-y)
:
| $(libcacard-lobj-y)
QEMU_CFLAGS
+=
-I
../
all
:
libcacard.la libcacard.pc
vscclient
:
LIBS += $(libcacard_libs)
vscclient
:
vscclient.o $(libcacard-obj-y)
vscclient
$(EXESUF)
:
LIBS += $(libcacard_libs)
vscclient
$(EXESUF)
:
libcacard/
vscclient.o $(libcacard-obj-y)
$(
call
LINK,
$^
)
clean
:
rm
-f
*
.o
*
/
*
.o
*
.d
*
/
*
.d
*
.a
*
/
*
.a
*
~
*
/
*
~ vscclient
*
.lo
*
/
*
.lo .libs/
*
*
/.libs/
*
*
.la
*
/
*
.la
*
.pc
rm
-Rf
.libs
*
/.libs
all
:
libcacard.la libcacard.pc
# Dummy command so that make thinks it has done something
@true
#########################################################################
# Rules for building libcacard standalone library
...
...
@@ -36,25 +24,22 @@ libcacard.la: LIBS += $(libcacard_libs)
libcacard.la
:
$(libcacard-lobj-y)
$(
call
LINK,
$^
)
libcacard_srcpath
=
$(SRC_PATH)
/libcacard
libcacard.pc
:
$(libcacard_srcpath)/libcacard.pc.in
libcacard.pc
:
$(SRC_PATH)/libcacard/libcacard.pc.in
$(
call
quiet-command,sed
-e
's|@LIBDIR@|
$(libdir)
|'
\
-e
's|@INCLUDEDIR@|
$(libcacard_includedir)
|'
\
-e
's|@VERSION@|
$(
shell
cat
$(SRC_PATH)
/VERSION
)
|'
\
-e
's|@PREFIX@|
$(prefix)
|'
\
<
$(libcacard_srcpath)
/libcacard.pc.in
>
libcacard.pc,
\
-e
's|@PREFIX@|
$(prefix)
|'
$<
>
libcacard.pc,
\
" GEN
$@
"
)
.PHONY
:
install-libcacard
install-libcacard
:
libcacard.pc libcacard.la vscclient
install
:
install-libcacard
install-libcacard
:
libcacard.pc libcacard.la
$(INSTALL_DIR)
"
$(DESTDIR)$(libdir)
"
$(INSTALL_DIR)
"
$(DESTDIR)$(libdir)
/pkgconfig"
$(INSTALL_DIR)
"
$(DESTDIR)$(libcacard_includedir)
"
$(INSTALL_DIR)
"
$(DESTDIR)$(bindir)
"
$(INSTALL_PROG)
vscclient
"
$(DESTDIR)$(bindir)
"
$(INSTALL_LIB)
libcacard.la
"
$(DESTDIR)$(libdir)
"
$(INSTALL_DATA)
libcacard.pc
"
$(DESTDIR)$(libdir)
/pkgconfig"
for
inc
in
*
.h
;
do
\
$(INSTALL_DATA)
$
(libcacard_srcpath)
/
$
$
inc
"
$(DESTDIR)$(libcacard_includedir)
"
;
\
for
inc
in
$(SRC_PATH)
/libcacard/
*
.h
;
do
\
$(INSTALL_DATA)
$$
inc
"
$(DESTDIR)$(libcacard_includedir)
"
;
\
done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录