From e66f3741e5b960e66b6856b3f7628c8d9b12ffb4 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:19 +0200 Subject: [PATCH] Move to configure CONFIG_WIN32 libraries needed always Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile | 4 ---- Makefile.target | 3 --- configure | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a79d1d3..5b55cdb 100644 --- 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 1f98862..6b6e70f 100644 --- 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 0960423..9819a73 100755 --- 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 -- 2.7.4