diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-17 16:26:45 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2013-04-18 14:12:31 +0200 |
| commit | 2b6b7099fb17ab9efa51c430e348ee88d6fbcef2 (patch) | |
| tree | 425233532df334b0ab9fed296e6292311d46445c | |
| parent | f544a488e55d3c504b65b6209199a977df9b24b9 (diff) | |
configure: eliminate target_libs_softmmu
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | default-configs/lm32-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/display/Makefile.objs | 5 |
3 files changed, 5 insertions, 5 deletions
@@ -3891,6 +3891,7 @@ fi if test "$glx" = "yes" ; then echo "CONFIG_GLX=y" >> $config_host_mak + echo "GLX_LIBS=$glx_libs" >> $config_host_mak fi if test "$libiscsi" = "yes" ; then @@ -4164,7 +4165,6 @@ bflt="no" target_nptl="no" interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` gdb_xml_files="" -target_libs_softmmu= TARGET_ARCH="$target_arch2" TARGET_BASE_ARCH="" @@ -4189,7 +4189,6 @@ case "$target_arch2" in target_nptl="yes" ;; lm32) - target_libs_softmmu="$glx_libs" ;; m68k) bflt="yes" @@ -4333,7 +4332,6 @@ if test "$target_bigendian" = "yes" ; then fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak - echo "LIBS+=$target_libs_softmmu" >> $config_target_mak case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak index ef0f4bae72..7df58c88cf 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -2,6 +2,7 @@ CONFIG_LM32=y CONFIG_MILKYMIST=y +CONFIG_MILKYMIST_TMU2=$(CONFIG_GLX) CONFIG_FRAMEBUFFER=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI01=y diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 3f7027d46b..6e9fb3b695 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -18,8 +18,9 @@ common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o common-obj-$(CONFIG_ZAURUS) += tc6393xb.o -ifeq ($(CONFIG_GLX),y) -common-obj-$(CONFIG_MILKYMIST) += milkymist-tmu2.o +ifeq ($(CONFIG_MILKYMIST_TMU2),y) +common-obj-y += milkymist-tmu2.o +libs_softmmu += $(GLX_LIBS) endif obj-$(CONFIG_OMAP) += omap_dss.o |