Move to configure CONFIG_WIN32 libraries needed always

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:

diff --git a/Makefile b/Makefile
index a79d1d31fdf2b380e4099a3a072bd029f2058d68..5b55cdb9a2f931ed9ed8f5505c2af0507bb773dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,6 @@ else
 DOCS=
 endif
 
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
-
 build-all: $(TOOLS) $(DOCS) recurse-all
 
 config-host.mak: configure

diff --git a/Makefile.target b/Makefile.target
index 1f9886220481dc7875eb3e93578aebc9b4a18e2e..6b6e70f5d9d66a183abac79480eeba7d82cb1ee1 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -48,9 +48,6 @@ endif
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
-ifdef CONFIG_WIN32
-LIBS+=-lwinmm -lws2_32 -liphlpapi
-endif
 ifdef CONFIG_SOLARIS
 ifdef CONFIG_NEEDS_LIBSUNMATH
 LIBS+=-lsunmath

diff --git a/configure b/configure
index 09604232af866c2c37649481fdee45b1c3b20c85..9819a732fa3ab77f5e656154543142315525584f 100755 (executable)
--- a/configure
+++ b/configure
@@ -355,6 +355,7 @@ if test "$mingw32" = "yes" ; then
   fi
   EXESUF=".exe"
   CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
+  LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
 fi
 
 # find source path