Patchwork [28/81] Move to configure CONFIG_WIN32 libraries needed always

login
register
mail settings
Submitter Juan Quintela
Date Aug. 3, 2009, 12:46 p.m.
Message ID <b7a8f7bb5a6ccb632308344abfc67f8decf1173f.1249301360.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/30529/
State Superseded
Headers show

Comments

Juan Quintela - Aug. 3, 2009, 12:46 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    4 ----
 Makefile.target |    3 ---
 configure       |    1 +
 3 files changed, 1 insertions(+), 7 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index 88e13e6..0ea8b46 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 b77c496..fdcf480 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 811952c..bc60dc1 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