[Qemu-devel] [PATCH 18/37] fold CURL_LIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/Makefile b/Makefile
index 1d8dd0e..ff333a5 100644
--- a/Makefile
+++ b/Makefile
@@ -159,8 +159,6 @@ obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
 obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
 obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o

-LIBS+=$(CURL_LIBS)
-
 cocoa.o: cocoa.m

 keymaps.o: keymaps.c keymaps.h
diff --git a/Makefile.target b/Makefile.target
index bd88887..420be27 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -638,7 +638,7 @@ vl.o: qemu-options.h

 monitor.o: qemu-monitor.h

-LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(CURL_LIBS)
+LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS)
 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)

 endif # !CONFIG_USER_ONLY
diff --git a/configure b/configure
index 51a9be5..595eaaa 100755
--- a/configure
+++ b/configure
@@ -1708,8 +1708,8 @@ if test "$inotify" = "yes" ; then
 fi
 if test "$curl" = "yes" ; then
   echo "CONFIG_CURL=y" >> $config_host_mak
-  echo "CURL_LIBS=$curl_libs" >> $config_host_mak
   echo "#define CONFIG_CURL 1" >> $config_host_h
+  LIBS="$LIBS $curl_libs"
 fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak
-- 
1.6.2.5