Generate a kernel32 dependency for dlls that have no imports to handle

dlls/Makefile.in

@@ -519,7 +519,7 @@ x11drv.dll$(DLLEXT): x11drv/x11drv.dll$(DLLEXT)
 advapi32/advapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd advapi32 && $(MAKE) advapi32.dll$(DLLEXT)
 
-avicap32/avicap32.dll$(DLLEXT): dummy
+avicap32/avicap32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd avicap32 && $(MAKE) avicap32.dll$(DLLEXT)
 
 avifil32/avifil32.dll$(DLLEXT): dummy msvfw32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
@@ -552,7 +552,7 @@ ddraw/ddraw.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
   libntdll.dll.$(LIBEXT)
 	@cd ddraw && $(MAKE) ddraw.dll$(DLLEXT)
 
-devenum/devenum.dll$(DLLEXT): dummy
+devenum/devenum.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd devenum && $(MAKE) devenum.dll$(DLLEXT)
 
 dinput/dinput.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
@@ -573,7 +573,7 @@ gdi/gdi32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
   libkernel32.dll.$(LIBEXT) libntdll.dll.$(LIBEXT)
 	@cd gdi && $(MAKE) gdi32.dll$(DLLEXT)
 
-glu32/glu32.dll$(DLLEXT): dummy
+glu32/glu32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd glu32 && $(MAKE) glu32.dll$(DLLEXT)
 
 icmp/icmp.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
@@ -591,7 +591,7 @@ kernel/kernel32.dll$(DLLEXT): dummy ntdll.dll$(DLLEXT) libntdll.dll.$(LIBEXT)
 lzexpand/lz32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd lzexpand && $(MAKE) lz32.dll$(DLLEXT)
 
-mapi32/mapi32.dll$(DLLEXT): dummy
+mapi32/mapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd mapi32 && $(MAKE) mapi32.dll$(DLLEXT)
 
 mpr/mpr.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
@@ -605,22 +605,22 @@ msacm/msacm32.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) user32.dll$(DLLEXT) \
   advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd msacm && $(MAKE) msacm32.dll$(DLLEXT)
 
-msacm/msg711/msg711.drv$(DLLEXT): dummy
+msacm/msg711/msg711.drv$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msacm/msg711 && $(MAKE) msg711.drv$(DLLEXT)
 
-msdmo/msdmo.dll$(DLLEXT): dummy
+msdmo/msdmo.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msdmo && $(MAKE) msdmo.dll$(DLLEXT)
 
-msimg32/msimg32.dll$(DLLEXT): dummy
+msimg32/msimg32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msimg32 && $(MAKE) msimg32.dll$(DLLEXT)
 
-msisys/msisys.ocx$(DLLEXT): dummy
+msisys/msisys.ocx$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msisys && $(MAKE) msisys.ocx$(DLLEXT)
 
-msnet32/msnet32.dll$(DLLEXT): dummy
+msnet32/msnet32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msnet32 && $(MAKE) msnet32.dll$(DLLEXT)
 
-msrle32/msrle32.dll$(DLLEXT): dummy
+msrle32/msrle32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd msrle32 && $(MAKE) msrle32.dll$(DLLEXT)
 
 msvcrt/msvcrt.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
@@ -633,13 +633,13 @@ msvideo/msvfw32.dll$(DLLEXT): dummy winmm.dll$(DLLEXT) comctl32.dll$(DLLEXT) \
   version.dll$(DLLEXT) user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd msvideo && $(MAKE) msvfw32.dll$(DLLEXT)
 
-netapi32/netapi32.dll$(DLLEXT): dummy
+netapi32/netapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd netapi32 && $(MAKE) netapi32.dll$(DLLEXT)
 
 ntdll/ntdll.dll$(DLLEXT): dummy
 	@cd ntdll && $(MAKE) ntdll.dll$(DLLEXT)
 
-odbc32/odbc32.dll$(DLLEXT): dummy
+odbc32/odbc32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd odbc32 && $(MAKE) odbc32.dll$(DLLEXT)
 
 ole32/ole32.dll$(DLLEXT): dummy advapi32.dll$(DLLEXT) user32.dll$(DLLEXT) \
@@ -670,10 +670,10 @@ opengl32/opengl32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
 psapi/psapi.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT)
 	@cd psapi && $(MAKE) psapi.dll$(DLLEXT)
 
-qcap/qcap.dll$(DLLEXT): dummy
+qcap/qcap.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd qcap && $(MAKE) qcap.dll$(DLLEXT)
 
-quartz/quartz.dll$(DLLEXT): dummy
+quartz/quartz.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd quartz && $(MAKE) quartz.dll$(DLLEXT)
 
 rasapi32/rasapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
@@ -708,10 +708,10 @@ shlwapi/shlwapi.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
   advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd shlwapi && $(MAKE) shlwapi.dll$(DLLEXT)
 
-snmpapi/snmpapi.dll$(DLLEXT): dummy
+snmpapi/snmpapi.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd snmpapi && $(MAKE) snmpapi.dll$(DLLEXT)
 
-sti/sti.dll$(DLLEXT): dummy
+sti/sti.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd sti && $(MAKE) sti.dll$(DLLEXT)
 
 tapi32/tapi32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
@@ -726,7 +726,7 @@ twain/twain_32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \
   kernel32.dll$(DLLEXT)
 	@cd twain && $(MAKE) twain_32.dll$(DLLEXT)
 
-url/url.dll$(DLLEXT): dummy
+url/url.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd url && $(MAKE) url.dll$(DLLEXT)
 
 urlmon/urlmon.dll$(DLLEXT): dummy ole32.dll$(DLLEXT)
@@ -810,7 +810,7 @@ winsock/ws2_32.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \
 winspool/winspool.drv$(DLLEXT): dummy advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT)
 	@cd winspool && $(MAKE) winspool.drv$(DLLEXT)
 
-wintrust/wintrust.dll$(DLLEXT): dummy
+wintrust/wintrust.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)
 	@cd wintrust && $(MAKE) wintrust.dll$(DLLEXT)
 
 wow32/wow32.dll$(DLLEXT): dummy kernel32.dll$(DLLEXT)

dlls/make_dlls

@@ -68,6 +68,7 @@ foreach $i (split(/\s/,$makefiles))
             next;
         }
     }
+    push @{$imports{$module}}, "kernel32.dll" unless @{$imports{$module}} || $module eq "ntdll.dll";
 }
 
 open NEWMAKE,">Makefile.in.new" or die "cannot create Makefile.in.new";