From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKb-0006Lv-Se for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USTKW-0005dU-SU for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:29 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:57319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKW-0005dE-NE for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:24 -0400 Received: by mail-ee0-f41.google.com with SMTP id c1so807025eek.0 for ; Wed, 17 Apr 2013 07:27:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:45 +0200 Message-Id: <1366208807-4433-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> References: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/13] configure: eliminate target_libs_softmmu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgar.iglesias@gmail.com Signed-off-by: Paolo Bonzini --- configure | 4 +--- default-configs/lm32-softmmu.mak | 1 + hw/display/Makefile.objs | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 35f90e3..6e775aa 100755 --- a/configure +++ b/configure @@ -3869,6 +3869,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 @@ -4142,7 +4143,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="" @@ -4167,7 +4167,6 @@ case "$target_arch2" in target_nptl="yes" ;; lm32) - target_libs_softmmu="$glx_libs" ;; m68k) bflt="yes" @@ -4311,7 +4310,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 ef0f4ba..7df58c8 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 3f7027d..6e9fb3b 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 -- 1.8.1.4