configure: Generate the dlls directory lists in configure instead of make_makefiles.
diff --git a/aclocal.m4 b/aclocal.m4
index 04ed90c..d877aa1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -168,12 +168,14 @@
 
 dnl **** Create a makefile from config.status ****
 dnl
-dnl Usage: WINE_CONFIG_MAKEFILE(file,deps)
+dnl Usage: WINE_CONFIG_MAKEFILE(file,deps,prefix,var)
 dnl
 AC_DEFUN([WINE_CONFIG_MAKEFILE],
-[m4_pushdef([ac_dir],m4_bpatsubst([$1],[/?Makefile$],[]))dnl
+[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\($3/?\(.*\)/\)?Makefile$],[\2]))dnl
 m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\
 	$1"])
+m4_ifval([$4],[$4="$[$4] \\
+	ac_dir"])
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 [$1: ]m4_ifval([$2],[$1.in $2],[$1.in])"
 AC_CONFIG_FILES([$1])dnl
diff --git a/configure b/configure
index 66e0fd5..4875601 100755
--- a/configure
+++ b/configure
@@ -779,6 +779,9 @@
 ALL_MAKERULES
 ALL_MAKEFILES
 ALL_MAKEFILE_DEPENDS
+ALL_DLL_DIRS
+ALL_IMPLIB_DIRS
+ALL_TEST_DIRS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files='MAKE_RULES
@@ -22174,6 +22177,13 @@
 ALL_MAKEFILE_DEPENDS="# Makefile dependencies"
 
 
+ALL_DLL_DIRS=""
+
+ALL_IMPLIB_DIRS=""
+
+ALL_TEST_DIRS=""
+
+
 
 
 
@@ -22230,2520 +22240,3296 @@
 
 
 
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 Makefile: Makefile.in Make.rules"
 ac_config_files="$ac_config_files Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/Makefile: dlls/Makefile.in Make.rules"
 ac_config_files="$ac_config_files dlls/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/acledit/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	acledit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/acledit/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/activeds/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	activeds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/activeds/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/actxprxy/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	actxprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/actxprxy/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/adsiid/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	adsiid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/adsiid/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	advapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/advapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advapi32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	advapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advpack/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	advpack"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/advpack/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advpack/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	advpack/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advpack/tests/Makefile: dlls/advpack/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/advpack/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/amstream/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	amstream"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/amstream/Makefile: dlls/amstream/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/amstream/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/appwiz.cpl/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	appwiz.cpl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/appwiz.cpl/Makefile: dlls/appwiz.cpl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/appwiz.cpl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/atl/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	atl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/atl/Makefile: dlls/atl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/atl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/avicap32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	avicap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/avicap32/Makefile: dlls/avicap32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/avicap32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/avifil32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	avifil32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/avifil32/Makefile: dlls/avifil32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/avifil32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/browseui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	browseui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/browseui/Makefile: dlls/browseui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/browseui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/browseui/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	browseui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/browseui/tests/Makefile: dlls/browseui/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/browseui/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cabinet/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cabinet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cabinet/Makefile: dlls/cabinet/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cabinet/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cabinet/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	cabinet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cabinet/tests/Makefile: dlls/cabinet/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/cabinet/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/capi2032/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	capi2032"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/capi2032/Makefile: dlls/capi2032/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/capi2032/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cards/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cards"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cards/Makefile: dlls/cards/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cards/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cfgmgr32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cfgmgr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cfgmgr32/Makefile: dlls/cfgmgr32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cfgmgr32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/clusapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	clusapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/clusapi/Makefile: dlls/clusapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/clusapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comcat/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	comcat"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comcat/Makefile: dlls/comcat/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/comcat/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comcat/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	comcat/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comcat/tests/Makefile: dlls/comcat/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/comcat/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comctl32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	comctl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comctl32/Makefile: dlls/comctl32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/comctl32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comctl32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	comctl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comctl32/tests/Makefile: dlls/comctl32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/comctl32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comdlg32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	comdlg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comdlg32/Makefile: dlls/comdlg32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/comdlg32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comdlg32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	comdlg32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/compstui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	compstui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/compstui/Makefile: dlls/compstui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/compstui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/credui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	credui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/credui/Makefile: dlls/credui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/credui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/credui/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	credui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/credui/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crtdll/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	crtdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crtdll/Makefile: dlls/crtdll/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/crtdll/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crypt32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	crypt32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/crypt32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crypt32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	crypt32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptdlg/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cryptdlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cryptdlg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptdll/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cryptdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cryptdll/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptnet/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cryptnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cryptnet/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptnet/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	cryptnet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	cryptui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptui/Makefile: dlls/cryptui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/cryptui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ctapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ctapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ctapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ctl3d32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ctl3d32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d10/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3d10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3d10/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d8/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3d8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d8/Makefile: dlls/d3d8/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3d8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d8/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3d8/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d8/tests/Makefile: dlls/d3d8/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3d8/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d9/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3d9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d9/Makefile: dlls/d3d9/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3d9/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d9/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3d9/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d9/tests/Makefile: dlls/d3d9/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3d9/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dim/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dim"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dim/Makefile: dlls/d3dim/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dim/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3drm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3drm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3drm/Makefile: dlls/d3drm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3drm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3drm/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3drm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx8/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx8/Makefile: dlls/d3dx8/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx8/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3dx8/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx8/tests/Makefile: dlls/d3dx8/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3dx8/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_24/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_24"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_24/Makefile: dlls/d3dx9_24/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_24/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_25/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_25"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_25/Makefile: dlls/d3dx9_25/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_25/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_26/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_26"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_26/Makefile: dlls/d3dx9_26/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_26/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_27/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_27"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_27/Makefile: dlls/d3dx9_27/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_27/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_28/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_28"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_28/Makefile: dlls/d3dx9_28/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_28/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_29/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_29"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_29/Makefile: dlls/d3dx9_29/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_29/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_30/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_30"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_30/Makefile: dlls/d3dx9_30/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_30/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_31/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_31"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_31/Makefile: dlls/d3dx9_31/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_31/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_32/Makefile: dlls/d3dx9_32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_33/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_33"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_33/Makefile: dlls/d3dx9_33/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_33/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_34/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_34"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_34/Makefile: dlls/d3dx9_34/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_34/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_35/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_35"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_35/Makefile: dlls/d3dx9_35/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_35/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_36/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_36"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_36/Makefile: dlls/d3dx9_36/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_36/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_36/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3dx9_36/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_36/tests/Makefile: dlls/d3dx9_36/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_36/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_37/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dx9_37"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_37/Makefile: dlls/d3dx9_37/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dx9_37/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dxof/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	d3dxof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dxof/Makefile: dlls/d3dxof/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/d3dxof/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dxof/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	d3dxof/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dxof/tests/Makefile: dlls/d3dxof/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/d3dxof/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dbghelp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dbghelp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dbghelp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dciman32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dciman32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dciman32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddraw/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ddraw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddraw/Makefile: dlls/ddraw/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ddraw/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddraw/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ddraw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddraw/tests/Makefile: dlls/ddraw/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ddraw/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddrawex/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ddrawex"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddrawex/Makefile: dlls/ddrawex/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ddrawex/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/devenum/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	devenum"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/devenum/Makefile: dlls/devenum/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/devenum/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dinput"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput/Makefile: dlls/dinput/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dinput/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	dinput/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput/tests/Makefile: dlls/dinput/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/dinput/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput8/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dinput8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput8/Makefile: dlls/dinput8/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dinput8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmband/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmband"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmband/Makefile: dlls/dmband/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmband/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmcompos/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmcompos"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmcompos/Makefile: dlls/dmcompos/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmcompos/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmime/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmime"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmime/Makefile: dlls/dmime/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmime/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmloader/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmloader"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmloader/Makefile: dlls/dmloader/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmloader/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmscript/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmscript/Makefile: dlls/dmscript/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmscript/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmstyle/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmstyle"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmstyle/Makefile: dlls/dmstyle/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmstyle/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmsynth/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmsynth"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmsynth/Makefile: dlls/dmsynth/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmsynth/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmusic/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmusic"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmusic/Makefile: dlls/dmusic/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmusic/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmusic32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dmusic32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmusic32/Makefile: dlls/dmusic32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dmusic32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dnsapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dnsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dnsapi/Makefile: dlls/dnsapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dnsapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dnsapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	dnsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/dnsapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplay/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dplay"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplay/Makefile: dlls/dplay/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dplay/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplayx/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dplayx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplayx/Makefile: dlls/dplayx/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dplayx/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplayx/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	dplayx/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/dplayx/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnaddr/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dpnaddr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dpnaddr/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnet/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dpnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dpnet/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnhpast/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dpnhpast"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dpnhpast/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnlobby/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dpnlobby"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dpnlobby/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpwsockx/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dpwsockx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpwsockx/Makefile: dlls/dpwsockx/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dpwsockx/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dsound/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dsound"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dsound/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dsound/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	dsound/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/dsound/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dssenh/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dssenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dssenh/Makefile: dlls/dssenh/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dssenh/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dswave/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dswave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dswave/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dwmapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dwmapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dwmapi/Makefile: dlls/dwmapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dwmapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxdiagn/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	dxdiagn"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/dxdiagn/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxerr8/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	dxerr8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/dxerr8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxerr9/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	dxerr9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/dxerr9/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxguid/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	dxguid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/dxguid/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/faultrep/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	faultrep"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/faultrep/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/fusion/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	fusion"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fusion/Makefile: dlls/fusion/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/fusion/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/fusion/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	fusion/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fusion/tests/Makefile: dlls/fusion/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/fusion/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	gdi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/gdi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdi32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	gdi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdiplus/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	gdiplus"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/gdiplus/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdiplus/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	gdiplus/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/gdiplus/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/glu32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	glu32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/glu32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gphoto2.ds/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	gphoto2.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gpkcsp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	gpkcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gpkcsp/Makefile: dlls/gpkcsp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/gpkcsp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hal/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	hal"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/hal/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hhctrl.ocx/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	hhctrl.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/hhctrl.ocx/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hid/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	hid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/hid/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hlink/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	hlink"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hlink/Makefile: dlls/hlink/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/hlink/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hlink/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	hlink/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hlink/tests/Makefile: dlls/hlink/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/hlink/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hnetcfg/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	hnetcfg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hnetcfg/Makefile: dlls/hnetcfg/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/hnetcfg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iccvid/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	iccvid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iccvid/Makefile: dlls/iccvid/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/iccvid/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/icmp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	icmp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/icmp/Makefile: dlls/icmp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/icmp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ifsmgr.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ifsmgr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ifsmgr.vxd/Makefile: dlls/ifsmgr.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ifsmgr.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imaadp32.acm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	imaadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imaadp32.acm/Makefile: dlls/imaadp32.acm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/imaadp32.acm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imagehlp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	imagehlp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/imagehlp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imm32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	imm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/imm32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imm32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	imm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/imm32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetcomm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	inetcomm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/inetcomm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetcomm/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	inetcomm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetmib1/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	inetmib1"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetmib1/Makefile: dlls/inetmib1/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/inetmib1/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetmib1/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	inetmib1/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetmib1/tests/Makefile: dlls/inetmib1/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/inetmib1/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/infosoft/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	infosoft"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/infosoft/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/infosoft/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	infosoft/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/initpki/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	initpki"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/initpki/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inkobj/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	inkobj"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/inkobj/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inseng/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	inseng"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/inseng/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iphlpapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	iphlpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/iphlpapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iphlpapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	iphlpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/iphlpapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itircl/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	itircl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/itircl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itss/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	itss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/itss/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itss/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	itss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/itss/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/jscript/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	jscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/jscript/Makefile: dlls/jscript/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/jscript/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/jscript/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	jscript/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/jscript/tests/Makefile: dlls/jscript/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/jscript/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/kernel32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	kernel32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/kernel32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/kernel32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	kernel32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localspl/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	localspl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/localspl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localspl/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	localspl/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/localspl/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	localui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localui/Makefile: dlls/localui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/localui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localui/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	localui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localui/tests/Makefile: dlls/localui/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/localui/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/lz32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	lz32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lz32/Makefile: dlls/lz32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/lz32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/lz32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	lz32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/lz32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mapi32/Makefile: dlls/mapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mapi32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	mapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mapi32/tests/Makefile: dlls/mapi32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/mapi32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciavi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mciavi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciavi32/Makefile: dlls/mciavi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mciavi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mcicda/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mcicda"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mcicda/Makefile: dlls/mcicda/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mcicda/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciseq/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mciseq"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciseq/Makefile: dlls/mciseq/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mciseq/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciwave/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mciwave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciwave/Makefile: dlls/mciwave/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mciwave/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/midimap/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	midimap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/midimap/Makefile: dlls/midimap/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/midimap/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mlang/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mlang"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mlang/Makefile: dlls/mlang/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mlang/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mlang/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	mlang/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/mlang/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mmdevldr.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mmdevldr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/monodebg.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	monodebg.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mountmgr.sys/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mountmgr.sys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mpr/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mpr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mpr/Makefile: dlls/mpr/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mpr/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mprapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mprapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mprapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msacm32.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32.drv/Makefile: dlls/msacm32.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msacm32.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msacm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32/Makefile: dlls/msacm32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msacm32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msacm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32/tests/Makefile: dlls/msacm32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/msacm32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msadp32.acm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msadp32.acm/Makefile: dlls/msadp32.acm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msadp32.acm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscat32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mscat32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscat32/Makefile: dlls/mscat32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mscat32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscms/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mscms"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscms/Makefile: dlls/mscms/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mscms/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscms/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	mscms/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscms/tests/Makefile: dlls/mscms/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/mscms/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscoree/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mscoree"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscoree/Makefile: dlls/mscoree/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mscoree/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msdmo/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msdmo"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msdmo/Makefile: dlls/msdmo/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msdmo/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msftedit/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msftedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msftedit/Makefile: dlls/msftedit/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msftedit/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msg711.acm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msg711.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msg711.acm/Makefile: dlls/msg711.acm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msg711.acm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml.tlb/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mshtml.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml.tlb/Makefile: dlls/mshtml.tlb/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mshtml.tlb/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mshtml"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml/Makefile: dlls/mshtml/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mshtml/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	mshtml/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/mshtml/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/msi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msimg32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msimg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msimg32/Makefile: dlls/msimg32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msimg32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msimtf/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msimtf"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msimtf/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msisip/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msisip"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisip/Makefile: dlls/msisip/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msisip/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msisys.ocx/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msisys.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msnet32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msnet32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msnet32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msrle32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msrle32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msrle32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mssip32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mssip32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mssip32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mstask/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mstask"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mstask/Makefile: dlls/mstask/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mstask/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mstask/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	mstask/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mstask/tests/Makefile: dlls/mstask/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/mstask/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcirt/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcirt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcirt/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcr71/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcr71"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcr71/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcrt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcrt/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msvcrt/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt/tests/Makefile: dlls/msvcrt/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/msvcrt/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt20/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcrt20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt20/Makefile: dlls/msvcrt20/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcrt20/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt40/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcrt40"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt40/Makefile: dlls/msvcrt40/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcrt40/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrtd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvcrtd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrtd/Makefile: dlls/msvcrtd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvcrtd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrtd/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msvcrtd/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrtd/tests/Makefile: dlls/msvcrtd/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/msvcrtd/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvfw32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvfw32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvfw32/Makefile: dlls/msvfw32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvfw32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvidc32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msvidc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvidc32/Makefile: dlls/msvidc32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msvidc32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mswsock/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	mswsock"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mswsock/Makefile: dlls/mswsock/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/mswsock/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msxml3/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	msxml3"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml3/Makefile: dlls/msxml3/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/msxml3/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msxml3/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	msxml3/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml3/tests/Makefile: dlls/msxml3/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/msxml3/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/nddeapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	nddeapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/nddeapi/Makefile: dlls/nddeapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/nddeapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/netapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	netapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/netapi32/Makefile: dlls/netapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/netapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/netapi32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	netapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/netapi32/tests/Makefile: dlls/netapi32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/netapi32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/newdev/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	newdev"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/newdev/Makefile: dlls/newdev/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/newdev/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdll/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ntdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdll/Makefile: dlls/ntdll/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ntdll/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdll/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ntdll/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ntdll/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdsapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ntdsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdsapi/Makefile: dlls/ntdsapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ntdsapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdsapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ntdsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdsapi/tests/Makefile: dlls/ntdsapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ntdsapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntoskrnl.exe/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ntoskrnl.exe"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntoskrnl.exe/Makefile: dlls/ntoskrnl.exe/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntprint/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ntprint"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntprint/Makefile: dlls/ntprint/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ntprint/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntprint/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ntprint/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntprint/tests/Makefile: dlls/ntprint/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ntprint/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/objsel/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	objsel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/objsel/Makefile: dlls/objsel/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/objsel/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbc32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	odbc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbc32/Makefile: dlls/odbc32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/odbc32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbccp32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	odbccp32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbccp32/Makefile: dlls/odbccp32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/odbccp32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbccp32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	odbccp32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ole32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole32/Makefile: dlls/ole32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ole32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ole32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole32/tests/Makefile: dlls/ole32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ole32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleacc/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	oleacc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleacc/Makefile: dlls/oleacc/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/oleacc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleaut32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	oleaut32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleaut32/Makefile: dlls/oleaut32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/oleaut32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleaut32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	oleaut32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleaut32/tests/Makefile: dlls/oleaut32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/oleaut32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olecli32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	olecli32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olecli32/Makefile: dlls/olecli32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/olecli32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oledlg/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	oledlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oledlg/Makefile: dlls/oledlg/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/oledlg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olepro32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	olepro32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olepro32/Makefile: dlls/olepro32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/olepro32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olesvr32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	olesvr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/olesvr32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olethk32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	olethk32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olethk32/Makefile: dlls/olethk32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/olethk32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/opengl32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	opengl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/opengl32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/opengl32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	opengl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/opengl32/tests/Makefile: dlls/opengl32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/opengl32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pdh/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	pdh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/pdh/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pdh/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	pdh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pdh/tests/Makefile: dlls/pdh/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/pdh/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/powrprof/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	powrprof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/powrprof/Makefile: dlls/powrprof/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/powrprof/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/printui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	printui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/printui/Makefile: dlls/printui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/printui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/propsys/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	propsys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/propsys/Makefile: dlls/propsys/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/propsys/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/psapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	psapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/psapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/psapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	psapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/psapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pstorec/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	pstorec"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/pstorec/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qcap/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	qcap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/qcap/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qedit/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	qedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/qedit/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qedit/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	qedit/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/qedit/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgr/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	qmgr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/qmgr/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgr/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	qmgr/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgr/tests/Makefile: dlls/qmgr/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/qmgr/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgrprxy/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	qmgrprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/quartz/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	quartz"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/quartz/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/quartz/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	quartz/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/quartz/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/query/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	query"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/query/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rasapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	rasapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rasapi32/Makefile: dlls/rasapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/rasapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rasapi32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	rasapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/rasapi32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/resutils/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	resutils"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/resutils/Makefile: dlls/resutils/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/resutils/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched20/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	riched20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched20/Makefile: dlls/riched20/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/riched20/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched20/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	riched20/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched20/tests/Makefile: dlls/riched20/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/riched20/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	riched32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched32/Makefile: dlls/riched32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/riched32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	riched32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/riched32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rpcrt4/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	rpcrt4"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/rpcrt4/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rpcrt4/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	rpcrt4/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsabase/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	rsabase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/rsabase/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsaenh/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	rsaenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/rsaenh/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsaenh/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	rsaenh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sane.ds/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sane.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sane.ds/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sccbase/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sccbase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sccbase/Makefile: dlls/sccbase/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sccbase/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/schannel/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	schannel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/schannel/Makefile: dlls/schannel/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/schannel/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/schannel/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	schannel/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/schannel/tests/Makefile: dlls/schannel/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/schannel/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/secur32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	secur32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/secur32/Makefile: dlls/secur32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/secur32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/secur32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	secur32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/secur32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/security/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	security"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/security/Makefile: dlls/security/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/security/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sensapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sensapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sensapi/Makefile: dlls/sensapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sensapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/serialui/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	serialui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/serialui/Makefile: dlls/serialui/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/serialui/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/serialui/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	serialui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/serialui/tests/Makefile: dlls/serialui/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/serialui/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/setupapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	setupapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/setupapi/Makefile: dlls/setupapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/setupapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/setupapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	setupapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/setupapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sfc/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sfc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sfc/Makefile: dlls/sfc/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sfc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sfc_os/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sfc_os"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sfc_os/Makefile: dlls/sfc_os/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sfc_os/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdoclc/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	shdoclc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdoclc/Makefile: dlls/shdoclc/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/shdoclc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdocvw/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	shdocvw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdocvw/Makefile: dlls/shdocvw/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/shdocvw/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdocvw/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	shdocvw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/shdocvw/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shell32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	shell32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shell32/Makefile: dlls/shell32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/shell32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shell32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	shell32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shell32/tests/Makefile: dlls/shell32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/shell32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shfolder/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	shfolder"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shfolder/Makefile: dlls/shfolder/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/shfolder/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shlwapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	shlwapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shlwapi/Makefile: dlls/shlwapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/shlwapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shlwapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	shlwapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/slbcsp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	slbcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/slbcsp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/slc/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	slc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/slc/Makefile: dlls/slc/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/slc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/snmpapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	snmpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/snmpapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/snmpapi/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	snmpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/softpub/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	softpub"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/softpub/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/spoolss/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	spoolss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/spoolss/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/spoolss/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	spoolss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/stdole2.tlb/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	stdole2.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole2.tlb/Makefile: dlls/stdole2.tlb/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/stdole2.tlb/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/stdole32.tlb/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	stdole32.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/stdole32.tlb/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sti/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sti"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sti/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/strmiids/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	strmiids"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/strmiids/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/svrapi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	svrapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/svrapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sxs/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	sxs"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sxs/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/tapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	tapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/tapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/twain_32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	twain_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/twain_32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/unicows/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	unicows"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/unicows/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/url/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	url"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/url/Makefile: dlls/url/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/url/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/urlmon/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	urlmon"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/urlmon/Makefile: dlls/urlmon/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/urlmon/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/urlmon/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	urlmon/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/urlmon/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/user32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	user32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/user32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/user32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	user32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/user32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/userenv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	userenv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/userenv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/userenv/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	userenv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/userenv/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/usp10/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	usp10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/usp10/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/usp10/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	usp10/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/usp10/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uuid/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	uuid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/uuid/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uxtheme/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	uxtheme"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uxtheme/Makefile: dlls/uxtheme/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/uxtheme/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uxtheme/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	uxtheme/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uxtheme/tests/Makefile: dlls/uxtheme/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/uxtheme/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vdhcp.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vdhcp.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdhcp.vxd/Makefile: dlls/vdhcp.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vdhcp.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vdmdbg/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vdmdbg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdmdbg/Makefile: dlls/vdmdbg/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vdmdbg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/version/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	version"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/version/Makefile: dlls/version/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/version/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/version/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	version/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/version/tests/Makefile: dlls/version/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/version/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vmm.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vmm.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vmm.vxd/Makefile: dlls/vmm.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vmm.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnbt.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vnbt.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnbt.vxd/Makefile: dlls/vnbt.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vnbt.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnetbios.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vnetbios.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnetbios.vxd/Makefile: dlls/vnetbios.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vnetbios.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vtdapi.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vtdapi.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vtdapi.vxd/Makefile: dlls/vtdapi.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vtdapi.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vwin32.vxd/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	vwin32.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vwin32.vxd/Makefile: dlls/vwin32.vxd/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/vwin32.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/w32skrnl/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	w32skrnl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/w32skrnl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winealsa.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winealsa.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winealsa.drv/Makefile: dlls/winealsa.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winealsa.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineaudioio.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wineaudioio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineaudioio.drv/Makefile: dlls/wineaudioio.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wineaudioio.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winecoreaudio.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winecoreaudio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winecoreaudio.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winecrt0/Makefile"
+ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+	winecrt0"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules"
 ac_config_files="$ac_config_files dlls/winecrt0/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wined3d/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wined3d"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wined3d/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winedos/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winedos"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winedos/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineesd.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wineesd.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineesd.drv/Makefile: dlls/wineesd.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wineesd.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winejack.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winejack.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejack.drv/Makefile: dlls/winejack.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winejack.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winejoystick.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winejoystick.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winejoystick.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winemp3.acm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winemp3.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winemp3.acm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winenas.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winenas.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winenas.drv/Makefile: dlls/winenas.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winenas.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineoss.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wineoss.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineoss.drv/Makefile: dlls/wineoss.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wineoss.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineps.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wineps.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wineps.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winequartz.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winequartz.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winequartz.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winex11.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winex11.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winex11.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wing32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wing32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wing32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winhttp/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winhttp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winhttp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winhttp/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	winhttp/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wininet/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wininet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wininet/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wininet/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	wininet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/wininet/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winmm/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winmm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winmm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winmm/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	winmm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/winmm/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winnls32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winnls32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winnls32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winscard/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winscard"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winscard/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winspool.drv/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winspool.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winspool.drv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winspool.drv/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	winspool.drv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintab32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wintab32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wintab32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintrust/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wintrust"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintrust/Makefile: dlls/wintrust/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wintrust/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintrust/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	wintrust/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintrust/tests/Makefile: dlls/wintrust/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/wintrust/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wldap32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wldap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wldap32/Makefile: dlls/wldap32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wldap32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wmi/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wmi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wmi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wnaspi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wnaspi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wnaspi32/Makefile: dlls/wnaspi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wnaspi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wow32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wow32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wow32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ws2_32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	ws2_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ws2_32/Makefile: dlls/ws2_32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/ws2_32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ws2_32/tests/Makefile"
+ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	ws2_32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ws2_32/tests/Makefile: dlls/ws2_32/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/ws2_32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wsock32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wsock32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wsock32/Makefile: dlls/wsock32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wsock32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wtsapi32/Makefile"
+ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wtsapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/wtsapi32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	documentation/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 documentation/Makefile: documentation/Makefile.in Make.rules"
 ac_config_files="$ac_config_files documentation/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	fonts/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 fonts/Makefile: fonts/Makefile.in Make.rules"
 ac_config_files="$ac_config_files fonts/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	include/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 include/Makefile: include/Makefile.in Make.rules"
 ac_config_files="$ac_config_files include/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	libs/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 libs/Makefile: libs/Makefile.in Make.rules"
 ac_config_files="$ac_config_files libs/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	libs/port/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 libs/port/Makefile: libs/port/Makefile.in Make.rules"
 ac_config_files="$ac_config_files libs/port/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	libs/wine/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 libs/wine/Makefile: libs/wine/Makefile.in Make.rules"
 ac_config_files="$ac_config_files libs/wine/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	libs/wpp/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 libs/wpp/Makefile: libs/wpp/Makefile.in Make.rules"
 ac_config_files="$ac_config_files libs/wpp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	loader/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 loader/Makefile: loader/Makefile.in Make.rules"
 ac_config_files="$ac_config_files loader/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/Makefile: programs/Makefile.in Make.rules"
 ac_config_files="$ac_config_files programs/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/clock/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/clock/Makefile: programs/clock/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/clock/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/cmd/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/cmd/Makefile: programs/cmd/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/cmd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/cmdlgtst/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/cmdlgtst/Makefile: programs/cmdlgtst/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/cmdlgtst/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/control/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/control/Makefile: programs/control/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/control/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/eject/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/eject/Makefile: programs/eject/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/eject/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/expand/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/expand/Makefile: programs/expand/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/expand/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/explorer/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/explorer/Makefile: programs/explorer/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/explorer/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/hh/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/hh/Makefile: programs/hh/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/hh/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/icinfo/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/icinfo/Makefile: programs/icinfo/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/icinfo/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/iexplore/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/iexplore/Makefile: programs/iexplore/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/iexplore/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/msiexec/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/msiexec/Makefile: programs/msiexec/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/msiexec/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/net/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/net/Makefile: programs/net/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/net/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/notepad/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/notepad/Makefile: programs/notepad/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/notepad/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/oleview/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/oleview/Makefile: programs/oleview/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/oleview/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/progman/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/progman/Makefile: programs/progman/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/progman/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/reg/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/reg/Makefile: programs/reg/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/reg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/regedit/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/regedit/Makefile: programs/regedit/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/regedit/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/regsvr32/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/regsvr32/Makefile: programs/regsvr32/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/regsvr32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/rpcss/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/rpcss/Makefile: programs/rpcss/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/rpcss/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/rundll32/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/rundll32/Makefile: programs/rundll32/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/rundll32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/secedit/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/secedit/Makefile: programs/secedit/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/secedit/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/services/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/services/Makefile: programs/services/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/services/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/spoolsv/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/spoolsv/Makefile: programs/spoolsv/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/spoolsv/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/start/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/start/Makefile: programs/start/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/start/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/svchost/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/svchost/Makefile: programs/svchost/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/svchost/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/taskmgr/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/taskmgr/Makefile: programs/taskmgr/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/taskmgr/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/uninstaller/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/uninstaller/Makefile: programs/uninstaller/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/uninstaller/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/view/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/view/Makefile: programs/view/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/view/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/wineboot/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wineboot/Makefile: programs/wineboot/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/wineboot/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winebrowser/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winebrowser/Makefile: programs/winebrowser/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winebrowser/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winecfg/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winecfg/Makefile: programs/winecfg/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winecfg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/wineconsole/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wineconsole/Makefile: programs/wineconsole/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/wineconsole/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winedbg/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winedbg/Makefile: programs/winedbg/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winedbg/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winedevice/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winedevice/Makefile: programs/winedevice/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winedevice/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winefile/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winefile/Makefile: programs/winefile/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winefile/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winemenubuilder/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winemenubuilder/Makefile: programs/winemenubuilder/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winemenubuilder/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winemine/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winemine/Makefile: programs/winemine/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winemine/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winepath/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winepath/Makefile: programs/winepath/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winepath/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winetest/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winetest/Makefile: programs/winetest/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winetest/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winevdm/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winevdm/Makefile: programs/winevdm/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winevdm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winhlp32/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winhlp32/Makefile: programs/winhlp32/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winhlp32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winver/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winver/Makefile: programs/winver/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/winver/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/wordpad/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wordpad/Makefile: programs/wordpad/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/wordpad/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/write/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/write/Makefile: programs/write/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/write/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/xcopy/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/xcopy/Makefile: programs/xcopy/Makefile.in programs/Makeprog.rules"
 ac_config_files="$ac_config_files programs/xcopy/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	server/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 server/Makefile: server/Makefile.in Make.rules"
 ac_config_files="$ac_config_files server/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/Makefile: tools/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/widl/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/widl/Makefile: tools/widl/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/widl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/winebuild/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/winebuild/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/winedump/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/winedump/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/winegcc/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/winegcc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/wmc/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/wmc/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	tools/wrc/Makefile"
+
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/wrc/Makefile"
@@ -26031,11 +26817,14 @@
 ALL_MAKERULES!$ALL_MAKERULES$ac_delim
 ALL_MAKEFILES!$ALL_MAKEFILES$ac_delim
 ALL_MAKEFILE_DEPENDS!$ALL_MAKEFILE_DEPENDS$ac_delim
+ALL_DLL_DIRS!$ALL_DLL_DIRS$ac_delim
+ALL_IMPLIB_DIRS!$ALL_IMPLIB_DIRS$ac_delim
+ALL_TEST_DIRS!$ALL_TEST_DIRS$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 8ded669..cd7070c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1675,6 +1675,10 @@
 AC_SUBST(ALL_MAKEFILES,"")
 AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
 
+AC_SUBST(ALL_DLL_DIRS,"")
+AC_SUBST(ALL_IMPLIB_DIRS,"")
+AC_SUBST(ALL_TEST_DIRS,"")
+
 AH_TOP([#define __WINE_CONFIG_H])
 
 AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
@@ -1694,362 +1698,362 @@
 
 WINE_CONFIG_MAKEFILE([Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([dlls/Makefile],[Make.rules])
-WINE_CONFIG_MAKEFILE([dlls/acledit/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/activeds/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/adsiid/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/advapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/capi2032/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cards/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cfgmgr32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/clusapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/comcat/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/crtdll/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/crypt32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/cryptdlg/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cryptdll/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cryptnet/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dim/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3drm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx8/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_24/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_25/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_26/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_27/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_28/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_29/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_30/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_31/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_33/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_34/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_35/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dx9_37/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmloader/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmscript/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmstyle/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmsynth/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmusic/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dmusic32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dnsapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/dplay/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dplayx/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/dpnaddr/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/glu32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/gphoto2.ds/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/gpkcsp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/hal/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/hhctrl.ocx/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/inetmib1/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/infosoft/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/initpki/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/inkobj/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/inseng/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/iphlpapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/itircl/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/itss/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msadp32.acm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mshtml.tlb/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mshtml/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msimg32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msimtf/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msisys.ocx/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msnet32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcirt/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcr71/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrt/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrt20/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/nddeapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/netapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/newdev/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntdll/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntdsapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntoskrnl.exe/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntprint/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/psapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/pstorec/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/qcap/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/qedit/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/qmgr/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/riched32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/rpcrt4/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/secur32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/security/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/sensapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shlwapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/slbcsp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/usp10/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winecrt0/Makefile],[dlls/Makeimplib.rules])
-WINE_CONFIG_MAKEFILE([dlls/wined3d/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winedos/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wineesd.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winejack.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winejoystick.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules])
-WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules])
-WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules])
+WINE_CONFIG_MAKEFILE([dlls/acledit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/activeds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/actxprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/adsiid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/advapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/advapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/advpack/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/browseui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cabinet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cabinet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/capi2032/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cards/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cfgmgr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/clusapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comcat/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comcat/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/crtdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/crypt32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/crypt32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cryptdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cryptdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cryptnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cryptnet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/cryptui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3d9/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dim/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3drm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3drm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_24/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_25/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_26/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_27/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_28/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_29/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_30/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_31/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_33/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_34/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_35/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_36/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dx9_37/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dxof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/d3dxof/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dbghelp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dciman32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ddraw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ddraw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ddrawex/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmloader/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmstyle/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmsynth/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmusic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dmusic32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dnsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dnsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dplay/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dplayx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dplayx/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dpnaddr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gdiplus/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/glu32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gphoto2.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gpkcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hal/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hhctrl.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inetcomm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inetmib1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inetmib1/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/infosoft/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/infosoft/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/initpki/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inkobj/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/inseng/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/iphlpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/iphlpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/itircl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/itss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/itss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mcicda/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mciseq/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mshtml.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mshtml/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mshtml/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msimg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msimtf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msisip/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msisys.ocx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msnet32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msrle32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mssip32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mstask/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mstask/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcirt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcr71/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrt/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrt20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msxml3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/nddeapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/netapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/netapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/newdev/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntdll/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntdll/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntdsapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntdsapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntoskrnl.exe/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntprint/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ntprint/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/opengl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/pdh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/pdh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/powrprof/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/printui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/propsys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/psapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/psapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/pstorec/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qcap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qedit/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qmgr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qmgr/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/resutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/riched20/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/riched20/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/riched32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/riched32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rpcrt4/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/schannel/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/secur32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/secur32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/security/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sensapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/serialui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/serialui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/setupapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/setupapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sfc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shlwapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/shlwapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/slbcsp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/urlmon/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/urlmon/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/user32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/user32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/userenv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/userenv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/usp10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winecrt0/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wined3d/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winedos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wineesd.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winejack.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winejoystick.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winhttp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winhttp/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wininet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wininet/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winmm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winmm/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wldap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wmi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wnaspi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wow32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ws2_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ws2_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wsock32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 5a50ce7..f33a695 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -7,6 +7,11 @@
 
 INSTALLDIRS = $(DESTDIR)$(dlldir)
 
+DLLSUBDIRS    = @ALL_DLL_DIRS@
+IMPLIBSUBDIRS = @ALL_IMPLIB_DIRS@
+TESTSUBDIRS   = @ALL_TEST_DIRS@
+SUBDIRS       = $(DLLSUBDIRS) $(IMPLIBSUBDIRS) $(TESTSUBDIRS)
+
 # special configure-dependent targets
 
 GLU32FILES = glu32
@@ -279,111 +284,6 @@
 	wsock32 \
 	wtsapi32
 
-IMPLIBSUBDIRS = \
-	adsiid \
-	dxerr8 \
-	dxerr9 \
-	dxguid \
-	strmiids \
-	uuid \
-	winecrt0
-
-TESTSUBDIRS = \
-	advapi32/tests \
-	advpack/tests \
-	browseui/tests \
-	cabinet/tests \
-	comcat/tests \
-	comctl32/tests \
-	comdlg32/tests \
-	credui/tests \
-	crypt32/tests \
-	cryptnet/tests \
-	d3d8/tests \
-	d3d9/tests \
-	d3drm/tests \
-	d3dx8/tests \
-	d3dx9_36/tests \
-	d3dxof/tests \
-	ddraw/tests \
-	dinput/tests \
-	dnsapi/tests \
-	dplayx/tests \
-	dsound/tests \
-	fusion/tests \
-	gdi32/tests \
-	gdiplus/tests \
-	hlink/tests \
-	imm32/tests \
-	inetcomm/tests \
-	inetmib1/tests \
-	infosoft/tests \
-	iphlpapi/tests \
-	itss/tests \
-	jscript/tests \
-	kernel32/tests \
-	localspl/tests \
-	localui/tests \
-	lz32/tests \
-	mapi32/tests \
-	mlang/tests \
-	msacm32/tests \
-	mscms/tests \
-	mshtml/tests \
-	msi/tests \
-	mstask/tests \
-	msvcrt/tests \
-	msvcrtd/tests \
-	msxml3/tests \
-	netapi32/tests \
-	ntdll/tests \
-	ntdsapi/tests \
-	ntprint/tests \
-	odbccp32/tests \
-	ole32/tests \
-	oleaut32/tests \
-	opengl32/tests \
-	pdh/tests \
-	psapi/tests \
-	qedit/tests \
-	qmgr/tests \
-	quartz/tests \
-	rasapi32/tests \
-	riched20/tests \
-	riched32/tests \
-	rpcrt4/tests \
-	rsaenh/tests \
-	schannel/tests \
-	secur32/tests \
-	serialui/tests \
-	setupapi/tests \
-	shdocvw/tests \
-	shell32/tests \
-	shlwapi/tests \
-	snmpapi/tests \
-	spoolss/tests \
-	urlmon/tests \
-	user32/tests \
-	userenv/tests \
-	usp10/tests \
-	uxtheme/tests \
-	version/tests \
-	winhttp/tests \
-	wininet/tests \
-	winmm/tests \
-	winspool.drv/tests \
-	wintrust/tests \
-	ws2_32/tests
-
-SUBDIRS = \
-	$(BASEDIRS) \
-	$(IMPLIBSUBDIRS) \
-	$(TESTSUBDIRS) \
-	glu32 \
-	opengl32 \
-	winequartz.drv \
-	winex11.drv
-
 BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)
 INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS)
 DOCSUBDIRS     = $(BASEDIRS) $(EXTRADIRS)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index c44bafe..b6c66bf 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -278,7 +278,11 @@
     {
         my %make = %{$makefiles{$file}};
         my $rules = $make{"=rules"};
-        push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules])\n";
+        my $args = "";
+        if ($rules eq $makerules{"MAKE_DLL_RULES"}) { $args = ",[dlls],[ALL_DLL_DIRS]"; }
+        elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; }
+        elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS]"; }
+        push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";
     }
 
     push @lines, "\nAC_OUTPUT\n";
@@ -318,7 +322,7 @@
 
 sub update_dlls(@)
 {
-    my (%directories, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
+    my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
     my $text = "";
     my @ignores = ();
 
@@ -326,13 +330,7 @@
     {
         my %makefile = %{$makefiles{$make}};
         next if defined $makefile{"=skip"};
-
-        if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
-        {
-            $testdirs{$1} = "$1/tests";
-            (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//;
-            next;
-        }
+        next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"});
 
         next unless defined $makefile{"MODULE"};
         my $module = $makefile{"MODULE"};
@@ -405,15 +403,6 @@
         $text .= " \\\n\t" . $dir;
     }
 
-    $text .= "\n\nIMPLIBSUBDIRS = \\\n\t";
-    $text .=  join " \\\n\t", sort values %staticlib_dirs;
-
-    $text .= "\n\nTESTSUBDIRS = \\\n\t";
-    $text .= join " \\\n\t", sort values %testdirs;
-
-    $text .=  "\n\nSUBDIRS = \\\n\t";
-    $text .= join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)", sort keys %special_dlls;
-
     $text .= "\n\nBUILDSUBDIRS   = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)\n";
     $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n";
     $text .= "DOCSUBDIRS     = \$(BASEDIRS) \$(EXTRADIRS)\n";