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

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)

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)
     {