makefiles: Disable 16-bit specific modules from make_makefiles.

configure

@@ -4099,13 +4099,6 @@ esac
 
 enable_win16=${enable_win16:-no}
 
-if test "x$enable_win16" != "xyes"
-then
-    enable_w32skrnl=${enable_w32skrnl:-no}
-    enable_winevdm=${enable_winevdm:-no}
-    enable_wow32=${enable_wow32:-no}
-fi
-
 if test -n "$with_wine64"
 then
     if test "x$enable_win64" = "xyes"
@@ -16906,7 +16899,7 @@ ac_config_files="$ac_config_files dlls/vwin32.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/w32skrnl/Makefile"
-test "x$enable_w32skrnl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	w32skrnl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules"
@@ -17306,7 +17299,7 @@ ac_config_files="$ac_config_files dlls/wnaspi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wow32/Makefile"
-test "x$enable_wow32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wow32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules"
@@ -17909,7 +17902,7 @@ ac_config_files="$ac_config_files programs/winetest/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winevdm/Makefile"
-test "x$enable_winevdm" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
+test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	winevdm" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\
 	winevdm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS

configure.ac

@@ -169,13 +169,6 @@ esac
 dnl enable_win16 defaults to yes on x86, to no on other CPUs
 enable_win16=${enable_win16:-no}
 
-if test "x$enable_win16" != "xyes"
-then
-    enable_w32skrnl=${enable_w32skrnl:-no}
-    enable_winevdm=${enable_winevdm:-no}
-    enable_wow32=${enable_wow32:-no}
-fi
-
 dnl Some special cases for the wow64 build
 if test -n "$with_wine64"
 then
@@ -2524,7 +2517,7 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
 WINE_CONFIG_DLL(vnetbios.vxd,enable_win16)
 WINE_CONFIG_DLL(vtdapi.vxd,enable_win16)
 WINE_CONFIG_DLL(vwin32.vxd,enable_win16)
-WINE_CONFIG_DLL(w32skrnl)
+WINE_CONFIG_DLL(w32skrnl,enable_win16)
 WINE_CONFIG_DLL(w32sys.dll16,enable_win16)
 WINE_CONFIG_DLL(wbemprox)
 WINE_CONFIG_DLL(wiaservc)
@@ -2574,7 +2567,7 @@ WINE_CONFIG_TEST(dlls/wldap32/tests)
 WINE_CONFIG_DLL(wmi)
 WINE_CONFIG_DLL(wmiutils)
 WINE_CONFIG_DLL(wnaspi32)
-WINE_CONFIG_DLL(wow32)
+WINE_CONFIG_DLL(wow32,enable_win16)
 WINE_CONFIG_DLL(ws2_32)
 WINE_CONFIG_TEST(dlls/ws2_32/tests)
 WINE_CONFIG_DLL(wsock32)
@@ -2643,7 +2636,7 @@ WINE_CONFIG_PROGRAM(winemenubuilder,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
 WINE_CONFIG_PROGRAM(winemine,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
 WINE_CONFIG_PROGRAM(winepath,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
 WINE_CONFIG_PROGRAM(winetest,[ALL_PROGRAM_DIRS])
-WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
+WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16)
 WINE_CONFIG_PROGRAM(winhelp.exe16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16)
 WINE_CONFIG_PROGRAM(winhlp32,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
 WINE_CONFIG_PROGRAM(winoldap.mod16,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],enable_win16)

tools/make_makefiles

@@ -55,6 +55,23 @@ my %dont_install =
   "winetest" => 1,
 );
 
+# Dlls and programs that are 16-bit specific
+my %modules16 =
+(
+  "ifsmgr.vxd" => 1,
+  "mmdevldr.vxd" => 1,
+  "monodebg.vxd" => 1,
+  "vdhcp.vxd" => 1,
+  "vmm.vxd" => 1,
+  "vnbt.vxd" => 1,
+  "vnetbios.vxd" => 1,
+  "vtdapi.vxd" => 1,
+  "vwin32.vxd" => 1,
+  "w32skrnl.dll" => 1,
+  "winevdm.exe" => 1,
+  "wow32.dll" => 1,
+);
+
 # Default patterns for top-level .gitignore
 my @ignores = (
     "*.[oa]",
@@ -339,10 +356,11 @@ sub update_makefiles(@)
         my %make = %{$makefiles{$file}};
         my $rules = $make{"=rules"};
         my $args = "";
+        my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}});
         if ($rules eq $makerules{"MAKE_DLL_RULES"})
         {
             (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
-            $args .= ",enable_win16" if $make{"MODULE"} =~ /(16|\.vxd)$/;
+            $args .= ",enable_win16" if $is_win16;
             push @lines, "WINE_CONFIG_DLL($name$args)\n";
         }
         elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
@@ -352,7 +370,7 @@ sub update_makefiles(@)
             $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name};
             $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
             $args .= "]";
-            $args .= ",enable_win16" if $make{"MODULE"} =~ /16$/;
+            $args .= ",enable_win16" if $is_win16;
             push @lines, "WINE_CONFIG_PROGRAM($name$args)\n";
         }
         elsif ($rules eq $makerules{"MAKE_TEST_RULES"})