Alexandre Julliard : make_makefiles: Avoid duplicate rules for static import libs on PE builds.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6cb1ac0575c10beeccbdc697fb7a85e0698d3f10
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6cb1ac0575c10beeccbdc697fb...

Author: Alexandre Julliard 
Date:   Thu May  1 17:31:35 2008 +0200

make_makefiles: Avoid duplicate rules for static import libs on PE builds.

---

dlls/Makefile.in     |    4 ++--
 tools/make_makefiles |   17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index d3bb2b7..755c75a 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -766,8 +766,8 @@ dciman32/libdciman32.$(IMPLIBEXT): dciman32/dciman32.spec $(WINEBUILD)
 ddraw/libddraw.$(IMPLIBEXT): ddraw/ddraw.spec $(WINEBUILD)
    @cd ddraw && $(MAKE) libddraw.$(IMPLIBEXT)

-dinput/libdinput.$(IMPLIBEXT): dinput/dinput.spec $(WINEBUILD)
-	@cd dinput && $(MAKE) libdinput.$(IMPLIBEXT)
+dinput/libdinput.def: dinput/dinput.spec $(WINEBUILD)
+	@cd dinput && $(MAKE) libdinput.def

dinput/libdinput.$(STATIC_IMPLIBEXT): dummy
    @cd dinput && $(MAKE) libdinput.$(STATIC_IMPLIBEXT)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index f727288..2a5f692 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -539,11 +539,18 @@ sub update_dlls(@)
         my $lib = $importlibs{$mod};
         my $spec = $mod;
         $spec =~ s/.dll$//;
-        $text .= sprintf "%s/lib%s.$(IMPLIBEXT): %s/%s.spec $(WINEBUILD)\n", $dir, $lib, $dir, $spec;
-        $text .= sprintf "\t@cd %s && $(MAKE) lib%s.$(IMPLIBEXT)\n\n", $dir, $lib;
-        next unless $static_implibs{$mod};
-        $text .= sprintf "%s/lib%s.$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
-        $text .= sprintf "\t@cd %s && $(MAKE) lib%s.$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
+        if (defined($static_implibs{$mod}))
+        {
+            $text .= sprintf "%s/lib%s.def: %s/%s.spec $(WINEBUILD)\n", $dir, $lib, $dir, $spec;
+            $text .= sprintf "\t@cd %s && $(MAKE) lib%s.def\n\n", $dir, $lib;
+            $text .= sprintf "%s/lib%s.$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
+            $text .= sprintf "\t@cd %s && $(MAKE) lib%s.$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
+        }
+        else
+        {
+            $text .= sprintf "%s/lib%s.$(IMPLIBEXT): %s/%s.spec $(WINEBUILD)\n", $dir, $lib, $dir, $spec;
+            $text .= sprintf "\t@cd %s && $(MAKE) lib%s.$(IMPLIBEXT)\n\n", $dir, $lib;
+        }
     }
     foreach my $mod (sort @lib_symlinks)
     {