From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKW-0006Ae-4v for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USTKV-0005d3-01 for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:24 -0400 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]:35167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKU-0005cx-PU for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:22 -0400 Received: by mail-ea0-f182.google.com with SMTP id q15so787178ead.41 for ; Wed, 17 Apr 2013 07:27:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:44 +0200 Message-Id: <1366208807-4433-11-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 10/13] configure: move common libraries to config-host.mak 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 Move -lm to the end of the line, so that it can be picked up as a dependency by pixman in the static build case. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- Makefile.target | 10 +++++----- configure | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 2bd6d14..2636103 100644 --- a/Makefile.target +++ b/Makefile.target @@ -31,10 +31,6 @@ PROGS+=$(QEMU_PROGW) endif STPFILES= -ifndef CONFIG_HAIKU -LIBS+=-lm -endif - config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak @@ -119,7 +115,7 @@ obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o -LIBS+=-lz +LIBS+=$(libs_softmmu) # xen support obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o @@ -149,6 +145,10 @@ include $(SRC_PATH)/Makefile.objs all-obj-y = $(obj-y) all-obj-y += $(addprefix ../, $(common-obj-y)) +ifndef CONFIG_HAIKU +LIBS+=-lm +endif + ifdef QEMU_PROGW # The linker builds a windows executable. Make also a console executable. $(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a diff --git a/configure b/configure index 1495214..35f90e3 100755 --- a/configure +++ b/configure @@ -1464,6 +1464,7 @@ EOF "Make sure to have the zlib libs and headers installed." fi fi +libs_softmmu="$libs_softmmu -lz" ########################################## # libseccomp check @@ -3585,6 +3586,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak echo "qemu_localedir=$qemu_localedir" >> $config_host_mak +echo "libs_softmmu=$libs_softmmu" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak @@ -4309,7 +4311,7 @@ if test "$target_bigendian" = "yes" ; then fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak - echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $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 -- 1.8.1.4