[Qemu-devel] [PATCH 10/20] -lz is needed for all binaries, move it to LIBS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile        |    2 --
 Makefile.target |    2 --
 configure       |    2 +-
 3 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 098f972..a94ea4c 100644
--- a/Makefile
+++ b/Makefile
@@ -165,8 +165,6 @@ qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o tool-osdep.o 
$(block-obj-y)

 qemu-io$(EXESUF):  qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y)

-qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
-
 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
        $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")

diff --git a/Makefile.target b/Makefile.target
index 601e97e..45d382a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -400,8 +400,6 @@ obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o 
machine.o \
 obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o

-LIBS+=-lz
-
 sound-obj-y =
 sound-obj-$(CONFIG_SB16) += sb16.o
 sound-obj-$(CONFIG_ES1370) += es1370.o
diff --git a/configure b/configure
index 0972738..4596eb1 100755
--- a/configure
+++ b/configure
@@ -869,7 +869,7 @@ cat > $TMPC << EOF
 int main(void) { zlibVersion(); return 0; }
 EOF
 if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lz > /dev/null 2> /dev/null ; 
then
-    :
+    LIBS="$LIBS -lz"
 else
     echo
     echo "Error: zlib check failed"
-- 
1.6.2.5