ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: eliminate target_libs_softmmu 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Paolo Bonzini 2013-04-17 16:26:45 +02:00 committed by Edgar E. Iglesias
parent f544a488e5
commit 2b6b7099fb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3891,6 +3891,7 @@ fi
if test "$glx" = "yes" ; then if test "$glx" = "yes" ; then
echo "CONFIG_GLX=y" >> $config_host_mak echo "CONFIG_GLX=y" >> $config_host_mak
echo "GLX_LIBS=$glx_libs" >> $config_host_mak
fi fi
if test "$libiscsi" = "yes" ; then if test "$libiscsi" = "yes" ; then
@ -4164,7 +4165,6 @@ bflt="no"
target_nptl="no" target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
gdb_xml_files="" gdb_xml_files=""
target_libs_softmmu=
TARGET_ARCH="$target_arch2" TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH="" TARGET_BASE_ARCH=""
@ -4189,7 +4189,6 @@ case "$target_arch2" in
target_nptl="yes" target_nptl="yes"
;; ;;
lm32) lm32)
target_libs_softmmu="$glx_libs"
;; ;;
m68k) m68k)
bflt="yes" bflt="yes"
@ -4333,7 +4332,6 @@ if test "$target_bigendian" = "yes" ; then
fi fi
if test "$target_softmmu" = "yes" ; then if test "$target_softmmu" = "yes" ; then
echo "CONFIG_SOFTMMU=y" >> $config_target_mak echo "CONFIG_SOFTMMU=y" >> $config_target_mak
echo "LIBS+=$target_libs_softmmu" >> $config_target_mak
case "$target_arch2" in case "$target_arch2" in
i386|x86_64) i386|x86_64)
echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak

1
default-configs/lm32-softmmu.mak
View File

@ -2,6 +2,7 @@
CONFIG_LM32=y CONFIG_LM32=y
CONFIG_MILKYMIST=y CONFIG_MILKYMIST=y
CONFIG_MILKYMIST_TMU2=$(CONFIG_GLX)
CONFIG_FRAMEBUFFER=y CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y

5
hw/display/Makefile.objs
View File

@ -18,8 +18,9 @@ common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
ifeq ($(CONFIG_GLX),y) ifeq ($(CONFIG_MILKYMIST_TMU2),y)
common-obj-$(CONFIG_MILKYMIST) += milkymist-tmu2.o common-obj-y += milkymist-tmu2.o
libs_softmmu += $(GLX_LIBS)
endif endif
obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_dss.o