From 2761b8de0e2e5b0fa219041bb9b4482e97a0c20b Mon Sep 17 00:00:00 2001
From: Jan Steffens <jan.steffens@gmail.com>
Date: Sat, 31 Jul 2010 00:27:38 +0200
Subject: [PATCH] Revert "configure: Build the import libraries without recursing when possible."

This reverts commit b0e48e1e2bb285fe9dd31c6c77505f0b51819178.
---
 aclocal.m4 |   20 +++++---------------
 configure  |   18 ++++--------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 4bf7229..f67e938 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -224,11 +224,6 @@ wine_fn_config_dll ()
     ac_implibsrc=$[4]
     ac_file="dlls/$ac_dir/lib$ac_implib"
     ac_deps="tools/widl tools/winebuild tools/winegcc include"
-    ac_implibflags=""
-
-    case $ac_dir in
-      *16) ac_implibflags=" -m16" ;;
-    esac
 
     wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
 
@@ -270,18 +265,16 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.$IMPLIBEXT
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
-$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
+	@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT
 install-dev:: dlls/$ac_dir/Makefile __builddeps__ 
 	@cd dlls/$ac_dir && \$(MAKE) install-dev"
         if test "x$CROSSTEST_DISABLE" = x
         then
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.cross.a
-$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
+$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
+	@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a"
         fi
 
         if test "$ac_dir" != "$ac_implib"
@@ -397,10 +390,7 @@ install-dev:: $ac_dir
 all __tooldeps__: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile libs/port dummy
-	@cd $ac_dir && \$(MAKE)"
-      case $ac_dir in
-        tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
-      esac])
+	@cd $ac_dir && \$(MAKE)"])
 }
 
 wine_fn_config_makerules ()
diff --git a/configure b/configure
index d8a14fb..8be5cfa 100755
--- a/configure
+++ b/configure
@@ -14091,11 +14091,6 @@ wine_fn_config_dll ()
     ac_implibsrc=$4
     ac_file="dlls/$ac_dir/lib$ac_implib"
     ac_deps="tools/widl tools/winebuild tools/winegcc include"
-    ac_implibflags=""
-
-    case $ac_dir in
-      *16) ac_implibflags=" -m16" ;;
-    esac
 
     wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
 
@@ -14139,18 +14134,16 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
     then
         wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.$IMPLIBEXT
-$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
-$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
+$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
+	@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT
 install-dev:: dlls/$ac_dir/Makefile __builddeps__
 	@cd dlls/$ac_dir && \$(MAKE) install-dev"
         if test "x$CROSSTEST_DISABLE" = x
         then
             wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "__builddeps__: $ac_file.cross.a
-$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
-	\$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
+$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
+	@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a"
         fi
 
         if test "$ac_dir" != "$ac_implib"
@@ -14277,9 +14270,6 @@ all __tooldeps__: $ac_dir
 .PHONY: $ac_dir
 $ac_dir: $ac_dir/Makefile libs/port dummy
 	@cd $ac_dir && \$(MAKE)"
-      case $ac_dir in
-        tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
-      esac
 fi
 }
 
-- 
1.7.2.1