diff --git a/Makefile.in b/Makefile.in
index fa52f010c26..eaf9fa68de5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = none
 
+ALL_DIRS           = @ALL_DIRS@
 ALL_DLL_DIRS       = @ALL_DLL_DIRS@
 ALL_INSTALL_DIRS   = @ALL_INSTALL_DIRS@
 ALL_PROGRAM_DIRS   = @ALL_PROGRAM_DIRS@
@@ -36,21 +37,7 @@ ALL_TOOL_DIRS      = @ALL_TOOL_DIRS@
 ALL_TOP_DIRS       = @ALL_TOP_DIRS@
 
 # Sub-directories to run make depend/clean into
-SUBDIRS = \
-	documentation \
-	fonts \
-	include \
-	libs/port \
-	libs/wine \
-	libs/wpp \
-	loader \
-	programs \
-	server \
-	$(ALL_TOOL_DIRS) \
-	$(ALL_STATICLIB_DIRS) \
-	$(ALL_DLL_DIRS) \
-	$(ALL_PROGRAM_DIRS) \
-	$(ALL_TEST_DIRS)
+SUBDIRS = $(ALL_DIRS)
 
 # Sub-directories to run make all into
 BUILDSUBDIRS = \
@@ -181,8 +168,7 @@ distclean:: clean
 
 # Makefile rules
 
-ALL_MAKEFILES = @ALL_MAKEFILES@
-ALL_CONFIGS   = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@
+ALL_CONFIGS = Makefile $(ALL_DIRS:%=%/Makefile) @ALL_MAKERULES@ @ALL_SYMLINKS@
 
 $(ALL_CONFIGS):
 	@./config.status $@
diff --git a/aclocal.m4 b/aclocal.m4
index d7b41c1a90b..85297acfd01 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -170,8 +170,8 @@ dnl
 AC_DEFUN([WINE_CONFIG_MAKEFILE],
 [m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\(\(.*\)/\)?Makefile$],[\2]))dnl
 m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/\(.*\)$],[\1]))dnl
-m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\
-	$1"])
+m4_ifval(ac_dir,[ALL_DIRS="$ALL_DIRS \\
+	ac_dir"])
 AS_VAR_PUSHDEF([ac_enable],m4_default([$4],[enable_]ac_name))dnl
 m4_ifval([$3],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$3],[ && ac_var="$ac_var \\
 	ac_dir"]))
diff --git a/configure b/configure
index 10620665747..c10a561d3d5 100755
--- a/configure
+++ b/configure
@@ -607,10 +607,10 @@ ALL_STATICLIB_DIRS
 ALL_TOOL_DIRS
 ALL_DLL_DIRS
 ALL_TOP_DIRS
+ALL_DIRS
 ALL_WINETEST_DEPENDS
 ALL_MAKEFILE_DEPENDS
 ALL_SYMLINKS
-ALL_MAKEFILES
 ALL_MAKERULES
 DEPENDENCIES
 LDAPLIBS
@@ -13655,8 +13655,6 @@ Makefile: dummy
 
 ALL_MAKERULES=""
 
-ALL_MAKEFILES=""
-
 ALL_SYMLINKS=""
 
 ALL_MAKEFILE_DEPENDS="# Makefile dependencies"
@@ -13664,6 +13662,8 @@ ALL_MAKEFILE_DEPENDS="# Makefile dependencies"
 ALL_WINETEST_DEPENDS="# Test binaries"
 
 
+ALL_DIRS=""
+
 ALL_TOP_DIRS=""
 
 ALL_DLL_DIRS=""
@@ -13768,8 +13768,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/acledit dlls/acledit/__install__ dlls/acledit/__install-lib__ dlls/acledit/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/acledit/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/acledit"
 test "x$enable_acledit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/acledit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13784,8 +13784,8 @@ dlls/aclui/libaclui.$IMPLIBEXT dlls/aclui/libaclui.cross.a: tools/widl tools/win
 dlls/aclui/libaclui.$IMPLIBEXT dlls/aclui/libaclui.cross.a: dlls/aclui/aclui.spec dlls/aclui/Makefile
 	@cd dlls/aclui && \$(MAKE) \`basename \$@\`
 dlls/aclui dlls/aclui/__install__ dlls/aclui/__install-lib__ dlls/aclui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/aclui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/aclui"
 test "x$enable_aclui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/aclui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13800,8 +13800,8 @@ dlls/activeds/libactiveds.$IMPLIBEXT dlls/activeds/libactiveds.cross.a: tools/wi
 dlls/activeds/libactiveds.$IMPLIBEXT dlls/activeds/libactiveds.cross.a: dlls/activeds/activeds.spec dlls/activeds/Makefile
 	@cd dlls/activeds && \$(MAKE) \`basename \$@\`
 dlls/activeds dlls/activeds/__install__ dlls/activeds/__install-lib__ dlls/activeds/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/activeds/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/activeds"
 test "x$enable_activeds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/activeds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13811,8 +13811,8 @@ ac_config_files="$ac_config_files dlls/activeds/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/actxprxy dlls/actxprxy/__install__ dlls/actxprxy/__install-lib__ dlls/actxprxy/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/actxprxy/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/actxprxy"
 test "x$enable_actxprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/actxprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13827,8 +13827,8 @@ dlls/adsiid: tools/widl tools/winebuild tools/winegcc include
 dlls/adsiid/__install__ dlls/adsiid/__install-dev__: dlls/adsiid
 dlls/adsiid/libadsiid.cross.a: dlls/adsiid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/adsiid && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/adsiid/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/adsiid"
 test "x$enable_adsiid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/adsiid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13843,8 +13843,8 @@ dlls/advapi32/libadvapi32.$IMPLIBEXT dlls/advapi32/libadvapi32.cross.a: tools/wi
 dlls/advapi32/libadvapi32.$IMPLIBEXT dlls/advapi32/libadvapi32.cross.a: dlls/advapi32/advapi32.spec dlls/advapi32/Makefile
 	@cd dlls/advapi32 && \$(MAKE) \`basename \$@\`
 dlls/advapi32 dlls/advapi32/__install__ dlls/advapi32/__install-lib__ dlls/advapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/advapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/advapi32"
 test "x$enable_advapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/advapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13863,8 +13863,8 @@ advapi32_test.exe: \$(TOPOBJDIR)/dlls/advapi32/tests/advapi32_test.exe$DLLEXT
 advapi32_test.rc:
 	echo \"advapi32_test.exe TESTRES \\\"advapi32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 advapi32_test.res: advapi32_test.rc advapi32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/advapi32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/advapi32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/advapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13879,8 +13879,8 @@ dlls/advpack/libadvpack.$IMPLIBEXT dlls/advpack/libadvpack.cross.a: tools/widl t
 dlls/advpack/libadvpack.$IMPLIBEXT dlls/advpack/libadvpack.cross.a: dlls/advpack/advpack.spec dlls/advpack/Makefile
 	@cd dlls/advpack && \$(MAKE) \`basename \$@\`
 dlls/advpack dlls/advpack/__install__ dlls/advpack/__install-lib__ dlls/advpack/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/advpack/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/advpack"
 test "x$enable_advpack" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/advpack"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13899,8 +13899,8 @@ advpack_test.exe: \$(TOPOBJDIR)/dlls/advpack/tests/advpack_test.exe$DLLEXT
 advpack_test.rc:
 	echo \"advpack_test.exe TESTRES \\\"advpack_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 advpack_test.res: advpack_test.rc advpack_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/advpack/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/advpack/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/advpack/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13910,8 +13910,8 @@ ac_config_files="$ac_config_files dlls/advpack/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/amstream dlls/amstream/__install__ dlls/amstream/__install-lib__ dlls/amstream/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/amstream/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/amstream"
 test "x$enable_amstream" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/amstream"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13930,8 +13930,8 @@ amstream_test.exe: \$(TOPOBJDIR)/dlls/amstream/tests/amstream_test.exe$DLLEXT
 amstream_test.rc:
 	echo \"amstream_test.exe TESTRES \\\"amstream_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 amstream_test.res: amstream_test.rc amstream_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/amstream/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/amstream/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/amstream/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13941,8 +13941,8 @@ ac_config_files="$ac_config_files dlls/amstream/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/appwiz.cpl dlls/appwiz.cpl/__install__ dlls/appwiz.cpl/__install-lib__ dlls/appwiz.cpl/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/appwiz.cpl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/appwiz.cpl"
 test "x$enable_appwiz_cpl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/appwiz.cpl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13957,8 +13957,8 @@ dlls/atl/libatl.$IMPLIBEXT dlls/atl/libatl.cross.a: tools/widl tools/winebuild t
 dlls/atl/libatl.$IMPLIBEXT dlls/atl/libatl.cross.a: dlls/atl/atl.spec dlls/atl/Makefile
 	@cd dlls/atl && \$(MAKE) \`basename \$@\`
 dlls/atl dlls/atl/__install__ dlls/atl/__install-lib__ dlls/atl/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/atl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/atl"
 test "x$enable_atl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/atl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13968,8 +13968,8 @@ ac_config_files="$ac_config_files dlls/atl/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/authz dlls/authz/__install__ dlls/authz/__install-lib__ dlls/authz/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/authz/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/authz"
 test "x$enable_authz" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/authz"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -13984,8 +13984,8 @@ dlls/avicap32/libavicap32.$IMPLIBEXT dlls/avicap32/libavicap32.cross.a: tools/wi
 dlls/avicap32/libavicap32.$IMPLIBEXT dlls/avicap32/libavicap32.cross.a: dlls/avicap32/avicap32.spec dlls/avicap32/Makefile
 	@cd dlls/avicap32 && \$(MAKE) \`basename \$@\`
 dlls/avicap32 dlls/avicap32/__install__ dlls/avicap32/__install-lib__ dlls/avicap32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/avicap32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/avicap32"
 test "x$enable_avicap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/avicap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14000,8 +14000,8 @@ dlls/avifil32/libavifil32.$IMPLIBEXT dlls/avifil32/libavifil32.cross.a: tools/wi
 dlls/avifil32/libavifil32.$IMPLIBEXT dlls/avifil32/libavifil32.cross.a: dlls/avifil32/avifil32.spec dlls/avifil32/Makefile
 	@cd dlls/avifil32 && \$(MAKE) \`basename \$@\`
 dlls/avifil32 dlls/avifil32/__install__ dlls/avifil32/__install-lib__ dlls/avifil32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/avifil32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/avifil32"
 test "x$enable_avifil32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/avifil32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14020,8 +14020,8 @@ avifil32_test.exe: \$(TOPOBJDIR)/dlls/avifil32/tests/avifil32_test.exe$DLLEXT
 avifil32_test.rc:
 	echo \"avifil32_test.exe TESTRES \\\"avifil32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 avifil32_test.res: avifil32_test.rc avifil32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/avifil32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/avifil32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/avifil32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14031,8 +14031,8 @@ ac_config_files="$ac_config_files dlls/avifil32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/avifile.dll16 dlls/avifile.dll16/__install__ dlls/avifile.dll16/__install-lib__ dlls/avifile.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/avifile.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/avifile.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/avifile.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14047,8 +14047,8 @@ dlls/avrt/libavrt.$IMPLIBEXT dlls/avrt/libavrt.cross.a: tools/widl tools/winebui
 dlls/avrt/libavrt.$IMPLIBEXT dlls/avrt/libavrt.cross.a: dlls/avrt/avrt.spec dlls/avrt/Makefile
 	@cd dlls/avrt && \$(MAKE) \`basename \$@\`
 dlls/avrt dlls/avrt/__install__ dlls/avrt/__install-lib__ dlls/avrt/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/avrt/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/avrt"
 test "x$enable_avrt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/avrt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14058,8 +14058,8 @@ ac_config_files="$ac_config_files dlls/avrt/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/bcrypt dlls/bcrypt/__install__ dlls/bcrypt/__install-lib__ dlls/bcrypt/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/bcrypt/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/bcrypt"
 test "x$enable_bcrypt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/bcrypt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14069,8 +14069,8 @@ ac_config_files="$ac_config_files dlls/bcrypt/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/browseui dlls/browseui/__install__ dlls/browseui/__install-lib__ dlls/browseui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/browseui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/browseui"
 test "x$enable_browseui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/browseui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14089,8 +14089,8 @@ browseui_test.exe: \$(TOPOBJDIR)/dlls/browseui/tests/browseui_test.exe$DLLEXT
 browseui_test.rc:
 	echo \"browseui_test.exe TESTRES \\\"browseui_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 browseui_test.res: browseui_test.rc browseui_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/browseui/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/browseui/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/browseui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14105,8 +14105,8 @@ dlls/cabinet/libcabinet.$IMPLIBEXT dlls/cabinet/libcabinet.cross.a: tools/widl t
 dlls/cabinet/libcabinet.$IMPLIBEXT dlls/cabinet/libcabinet.cross.a: dlls/cabinet/cabinet.spec dlls/cabinet/Makefile
 	@cd dlls/cabinet && \$(MAKE) \`basename \$@\`
 dlls/cabinet dlls/cabinet/__install__ dlls/cabinet/__install-lib__ dlls/cabinet/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cabinet/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cabinet"
 test "x$enable_cabinet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cabinet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14125,8 +14125,8 @@ cabinet_test.exe: \$(TOPOBJDIR)/dlls/cabinet/tests/cabinet_test.exe$DLLEXT
 cabinet_test.rc:
 	echo \"cabinet_test.exe TESTRES \\\"cabinet_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 cabinet_test.res: cabinet_test.rc cabinet_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cabinet/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cabinet/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/cabinet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14141,8 +14141,8 @@ dlls/capi2032/libcapi2032.$IMPLIBEXT dlls/capi2032/libcapi2032.cross.a: tools/wi
 dlls/capi2032/libcapi2032.$IMPLIBEXT dlls/capi2032/libcapi2032.cross.a: dlls/capi2032/capi2032.spec dlls/capi2032/Makefile
 	@cd dlls/capi2032 && \$(MAKE) \`basename \$@\`
 dlls/capi2032 dlls/capi2032/__install__ dlls/capi2032/__install-lib__ dlls/capi2032/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/capi2032/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/capi2032"
 test "x$enable_capi2032" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/capi2032"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14157,8 +14157,8 @@ dlls/cards/libcards.$IMPLIBEXT dlls/cards/libcards.cross.a: tools/widl tools/win
 dlls/cards/libcards.$IMPLIBEXT dlls/cards/libcards.cross.a: dlls/cards/cards.spec dlls/cards/Makefile
 	@cd dlls/cards && \$(MAKE) \`basename \$@\`
 dlls/cards dlls/cards/__install__ dlls/cards/__install-lib__ dlls/cards/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cards/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cards"
 test "x$enable_cards" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cards"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14173,8 +14173,8 @@ dlls/cfgmgr32/libcfgmgr32.$IMPLIBEXT dlls/cfgmgr32/libcfgmgr32.cross.a: tools/wi
 dlls/cfgmgr32/libcfgmgr32.$IMPLIBEXT dlls/cfgmgr32/libcfgmgr32.cross.a: dlls/cfgmgr32/cfgmgr32.spec dlls/cfgmgr32/Makefile
 	@cd dlls/cfgmgr32 && \$(MAKE) \`basename \$@\`
 dlls/cfgmgr32 dlls/cfgmgr32/__install__ dlls/cfgmgr32/__install-lib__ dlls/cfgmgr32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cfgmgr32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cfgmgr32"
 test "x$enable_cfgmgr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cfgmgr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14189,8 +14189,8 @@ dlls/clusapi/libclusapi.$IMPLIBEXT dlls/clusapi/libclusapi.cross.a: tools/widl t
 dlls/clusapi/libclusapi.$IMPLIBEXT dlls/clusapi/libclusapi.cross.a: dlls/clusapi/clusapi.spec dlls/clusapi/Makefile
 	@cd dlls/clusapi && \$(MAKE) \`basename \$@\`
 dlls/clusapi dlls/clusapi/__install__ dlls/clusapi/__install-lib__ dlls/clusapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/clusapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/clusapi"
 test "x$enable_clusapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/clusapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14200,8 +14200,8 @@ ac_config_files="$ac_config_files dlls/clusapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comcat dlls/comcat/__install__ dlls/comcat/__install-lib__ dlls/comcat/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comcat/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comcat"
 test "x$enable_comcat" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/comcat"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14220,8 +14220,8 @@ comcat_test.exe: \$(TOPOBJDIR)/dlls/comcat/tests/comcat_test.exe$DLLEXT
 comcat_test.rc:
 	echo \"comcat_test.exe TESTRES \\\"comcat_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 comcat_test.res: comcat_test.rc comcat_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comcat/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comcat/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/comcat/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14236,8 +14236,8 @@ dlls/comctl32/libcomctl32.$IMPLIBEXT dlls/comctl32/libcomctl32.cross.a: tools/wi
 dlls/comctl32/libcomctl32.$IMPLIBEXT dlls/comctl32/libcomctl32.cross.a: dlls/comctl32/comctl32.spec dlls/comctl32/Makefile
 	@cd dlls/comctl32 && \$(MAKE) \`basename \$@\`
 dlls/comctl32 dlls/comctl32/__install__ dlls/comctl32/__install-lib__ dlls/comctl32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comctl32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comctl32"
 test "x$enable_comctl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/comctl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14256,8 +14256,8 @@ comctl32_test.exe: \$(TOPOBJDIR)/dlls/comctl32/tests/comctl32_test.exe$DLLEXT
 comctl32_test.rc:
 	echo \"comctl32_test.exe TESTRES \\\"comctl32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 comctl32_test.res: comctl32_test.rc comctl32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comctl32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comctl32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/comctl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14272,8 +14272,8 @@ dlls/comdlg32/libcomdlg32.$IMPLIBEXT dlls/comdlg32/libcomdlg32.cross.a: tools/wi
 dlls/comdlg32/libcomdlg32.$IMPLIBEXT dlls/comdlg32/libcomdlg32.cross.a: dlls/comdlg32/comdlg32.spec dlls/comdlg32/Makefile
 	@cd dlls/comdlg32 && \$(MAKE) \`basename \$@\`
 dlls/comdlg32 dlls/comdlg32/__install__ dlls/comdlg32/__install-lib__ dlls/comdlg32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comdlg32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comdlg32"
 test "x$enable_comdlg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/comdlg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14292,8 +14292,8 @@ comdlg32_test.exe: \$(TOPOBJDIR)/dlls/comdlg32/tests/comdlg32_test.exe$DLLEXT
 comdlg32_test.rc:
 	echo \"comdlg32_test.exe TESTRES \\\"comdlg32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 comdlg32_test.res: comdlg32_test.rc comdlg32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comdlg32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comdlg32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/comdlg32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14303,8 +14303,8 @@ ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comm.drv16 dlls/comm.drv16/__install__ dlls/comm.drv16/__install-lib__ dlls/comm.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/comm.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/comm.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/comm.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14314,8 +14314,8 @@ ac_config_files="$ac_config_files dlls/comm.drv16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/commdlg.dll16 dlls/commdlg.dll16/__install__ dlls/commdlg.dll16/__install-lib__ dlls/commdlg.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/commdlg.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/commdlg.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/commdlg.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14325,8 +14325,8 @@ ac_config_files="$ac_config_files dlls/commdlg.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/compobj.dll16 dlls/compobj.dll16/__install__ dlls/compobj.dll16/__install-lib__ dlls/compobj.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/compobj.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/compobj.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/compobj.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14341,8 +14341,8 @@ dlls/compstui/libcompstui.$IMPLIBEXT dlls/compstui/libcompstui.cross.a: tools/wi
 dlls/compstui/libcompstui.$IMPLIBEXT dlls/compstui/libcompstui.cross.a: dlls/compstui/compstui.spec dlls/compstui/Makefile
 	@cd dlls/compstui && \$(MAKE) \`basename \$@\`
 dlls/compstui dlls/compstui/__install__ dlls/compstui/__install-lib__ dlls/compstui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/compstui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/compstui"
 test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/compstui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14357,8 +14357,8 @@ dlls/credui/libcredui.$IMPLIBEXT dlls/credui/libcredui.cross.a: tools/widl tools
 dlls/credui/libcredui.$IMPLIBEXT dlls/credui/libcredui.cross.a: dlls/credui/credui.spec dlls/credui/Makefile
 	@cd dlls/credui && \$(MAKE) \`basename \$@\`
 dlls/credui dlls/credui/__install__ dlls/credui/__install-lib__ dlls/credui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/credui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/credui"
 test "x$enable_credui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/credui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14377,8 +14377,8 @@ credui_test.exe: \$(TOPOBJDIR)/dlls/credui/tests/credui_test.exe$DLLEXT
 credui_test.rc:
 	echo \"credui_test.exe TESTRES \\\"credui_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 credui_test.res: credui_test.rc credui_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/credui/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/credui/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/credui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14393,8 +14393,8 @@ dlls/crtdll/libcrtdll.$IMPLIBEXT dlls/crtdll/libcrtdll.cross.a: tools/widl tools
 dlls/crtdll/libcrtdll.$IMPLIBEXT dlls/crtdll/libcrtdll.cross.a: dlls/crtdll/crtdll.spec dlls/crtdll/Makefile
 	@cd dlls/crtdll && \$(MAKE) \`basename \$@\`
 dlls/crtdll dlls/crtdll/__install__ dlls/crtdll/__install-lib__ dlls/crtdll/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/crtdll/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/crtdll"
 test "x$enable_crtdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/crtdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14409,8 +14409,8 @@ dlls/crypt32/libcrypt32.$IMPLIBEXT dlls/crypt32/libcrypt32.cross.a: tools/widl t
 dlls/crypt32/libcrypt32.$IMPLIBEXT dlls/crypt32/libcrypt32.cross.a: dlls/crypt32/crypt32.spec dlls/crypt32/Makefile
 	@cd dlls/crypt32 && \$(MAKE) \`basename \$@\`
 dlls/crypt32 dlls/crypt32/__install__ dlls/crypt32/__install-lib__ dlls/crypt32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/crypt32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/crypt32"
 test "x$enable_crypt32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/crypt32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14429,8 +14429,8 @@ crypt32_test.exe: \$(TOPOBJDIR)/dlls/crypt32/tests/crypt32_test.exe$DLLEXT
 crypt32_test.rc:
 	echo \"crypt32_test.exe TESTRES \\\"crypt32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 crypt32_test.res: crypt32_test.rc crypt32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/crypt32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/crypt32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/crypt32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14440,8 +14440,8 @@ ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptdlg dlls/cryptdlg/__install__ dlls/cryptdlg/__install-lib__ dlls/cryptdlg/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptdlg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptdlg"
 test "x$enable_cryptdlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cryptdlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14456,8 +14456,8 @@ dlls/cryptdll/libcryptdll.$IMPLIBEXT dlls/cryptdll/libcryptdll.cross.a: tools/wi
 dlls/cryptdll/libcryptdll.$IMPLIBEXT dlls/cryptdll/libcryptdll.cross.a: dlls/cryptdll/cryptdll.spec dlls/cryptdll/Makefile
 	@cd dlls/cryptdll && \$(MAKE) \`basename \$@\`
 dlls/cryptdll dlls/cryptdll/__install__ dlls/cryptdll/__install-lib__ dlls/cryptdll/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptdll/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptdll"
 test "x$enable_cryptdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cryptdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14472,8 +14472,8 @@ dlls/cryptnet/libcryptnet.$IMPLIBEXT dlls/cryptnet/libcryptnet.cross.a: tools/wi
 dlls/cryptnet/libcryptnet.$IMPLIBEXT dlls/cryptnet/libcryptnet.cross.a: dlls/cryptnet/cryptnet.spec dlls/cryptnet/Makefile
 	@cd dlls/cryptnet && \$(MAKE) \`basename \$@\`
 dlls/cryptnet dlls/cryptnet/__install__ dlls/cryptnet/__install-lib__ dlls/cryptnet/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptnet/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptnet"
 test "x$enable_cryptnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cryptnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14492,8 +14492,8 @@ cryptnet_test.exe: \$(TOPOBJDIR)/dlls/cryptnet/tests/cryptnet_test.exe$DLLEXT
 cryptnet_test.rc:
 	echo \"cryptnet_test.exe TESTRES \\\"cryptnet_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 cryptnet_test.res: cryptnet_test.rc cryptnet_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptnet/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptnet/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/cryptnet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14508,8 +14508,8 @@ dlls/cryptui/libcryptui.$IMPLIBEXT dlls/cryptui/libcryptui.cross.a: tools/widl t
 dlls/cryptui/libcryptui.$IMPLIBEXT dlls/cryptui/libcryptui.cross.a: dlls/cryptui/cryptui.spec dlls/cryptui/Makefile
 	@cd dlls/cryptui && \$(MAKE) \`basename \$@\`
 dlls/cryptui dlls/cryptui/__install__ dlls/cryptui/__install-lib__ dlls/cryptui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptui"
 test "x$enable_cryptui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/cryptui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14528,8 +14528,8 @@ cryptui_test.exe: \$(TOPOBJDIR)/dlls/cryptui/tests/cryptui_test.exe$DLLEXT
 cryptui_test.rc:
 	echo \"cryptui_test.exe TESTRES \\\"cryptui_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 cryptui_test.res: cryptui_test.rc cryptui_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/cryptui/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/cryptui/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/cryptui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14539,8 +14539,8 @@ ac_config_files="$ac_config_files dlls/cryptui/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctapi32 dlls/ctapi32/__install__ dlls/ctapi32/__install-lib__ dlls/ctapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ctapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ctapi32"
 test "x$enable_ctapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ctapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14550,8 +14550,8 @@ ac_config_files="$ac_config_files dlls/ctapi32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctl3d.dll16 dlls/ctl3d.dll16/__install__ dlls/ctl3d.dll16/__install-lib__ dlls/ctl3d.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ctl3d.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ctl3d.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ctl3d.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14566,8 +14566,8 @@ dlls/ctl3d32/libctl3d32.$IMPLIBEXT dlls/ctl3d32/libctl3d32.cross.a: tools/widl t
 dlls/ctl3d32/libctl3d32.$IMPLIBEXT dlls/ctl3d32/libctl3d32.cross.a: dlls/ctl3d32/ctl3d32.spec dlls/ctl3d32/Makefile
 	@cd dlls/ctl3d32 && \$(MAKE) \`basename \$@\`
 dlls/ctl3d32 dlls/ctl3d32/__install__ dlls/ctl3d32/__install-lib__ dlls/ctl3d32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ctl3d32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ctl3d32"
 test "x$enable_ctl3d32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ctl3d32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14577,8 +14577,8 @@ ac_config_files="$ac_config_files dlls/ctl3d32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctl3dv2.dll16 dlls/ctl3dv2.dll16/__install__ dlls/ctl3dv2.dll16/__install-lib__ dlls/ctl3dv2.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ctl3dv2.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ctl3dv2.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ctl3dv2.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14593,8 +14593,8 @@ dlls/d3d10/libd3d10.$IMPLIBEXT dlls/d3d10/libd3d10.cross.a: tools/widl tools/win
 dlls/d3d10/libd3d10.$IMPLIBEXT dlls/d3d10/libd3d10.cross.a: dlls/d3d10/d3d10.spec dlls/d3d10/Makefile
 	@cd dlls/d3d10 && \$(MAKE) \`basename \$@\`
 dlls/d3d10 dlls/d3d10/__install__ dlls/d3d10/__install-lib__ dlls/d3d10/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d10/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d10"
 test "x$enable_d3d10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3d10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14613,8 +14613,8 @@ d3d10_test.exe: \$(TOPOBJDIR)/dlls/d3d10/tests/d3d10_test.exe$DLLEXT
 d3d10_test.rc:
 	echo \"d3d10_test.exe TESTRES \\\"d3d10_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3d10_test.res: d3d10_test.rc d3d10_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d10/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d10/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3d10/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14629,8 +14629,8 @@ dlls/d3d10core/libd3d10core.$IMPLIBEXT dlls/d3d10core/libd3d10core.cross.a: tool
 dlls/d3d10core/libd3d10core.$IMPLIBEXT dlls/d3d10core/libd3d10core.cross.a: dlls/d3d10core/d3d10core.spec dlls/d3d10core/Makefile
 	@cd dlls/d3d10core && \$(MAKE) \`basename \$@\`
 dlls/d3d10core dlls/d3d10core/__install__ dlls/d3d10core/__install-lib__ dlls/d3d10core/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d10core/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d10core"
 test "x$enable_d3d10core" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3d10core"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14649,8 +14649,8 @@ d3d10core_test.exe: \$(TOPOBJDIR)/dlls/d3d10core/tests/d3d10core_test.exe$DLLEXT
 d3d10core_test.rc:
 	echo \"d3d10core_test.exe TESTRES \\\"d3d10core_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3d10core_test.res: d3d10core_test.rc d3d10core_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d10core/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d10core/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3d10core/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14665,8 +14665,8 @@ dlls/d3d8/libd3d8.$IMPLIBEXT dlls/d3d8/libd3d8.cross.a: tools/widl tools/winebui
 dlls/d3d8/libd3d8.$IMPLIBEXT dlls/d3d8/libd3d8.cross.a: dlls/d3d8/d3d8.spec dlls/d3d8/Makefile
 	@cd dlls/d3d8 && \$(MAKE) \`basename \$@\`
 dlls/d3d8 dlls/d3d8/__install__ dlls/d3d8/__install-lib__ dlls/d3d8/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d8/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d8"
 test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3d8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14685,8 +14685,8 @@ d3d8_test.exe: \$(TOPOBJDIR)/dlls/d3d8/tests/d3d8_test.exe$DLLEXT
 d3d8_test.rc:
 	echo \"d3d8_test.exe TESTRES \\\"d3d8_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3d8_test.res: d3d8_test.rc d3d8_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d8/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d8/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3d8/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14701,8 +14701,8 @@ dlls/d3d9/libd3d9.$IMPLIBEXT dlls/d3d9/libd3d9.cross.a: tools/widl tools/winebui
 dlls/d3d9/libd3d9.$IMPLIBEXT dlls/d3d9/libd3d9.cross.a: dlls/d3d9/d3d9.spec dlls/d3d9/Makefile
 	@cd dlls/d3d9 && \$(MAKE) \`basename \$@\`
 dlls/d3d9 dlls/d3d9/__install__ dlls/d3d9/__install-lib__ dlls/d3d9/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d9/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d9"
 test "x$enable_d3d9" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3d9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14721,8 +14721,8 @@ d3d9_test.exe: \$(TOPOBJDIR)/dlls/d3d9/tests/d3d9_test.exe$DLLEXT
 d3d9_test.rc:
 	echo \"d3d9_test.exe TESTRES \\\"d3d9_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3d9_test.res: d3d9_test.rc d3d9_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3d9/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3d9/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3d9/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14737,8 +14737,8 @@ dlls/d3dim/libd3dim.$IMPLIBEXT dlls/d3dim/libd3dim.cross.a: tools/widl tools/win
 dlls/d3dim/libd3dim.$IMPLIBEXT dlls/d3dim/libd3dim.cross.a: dlls/d3dim/d3dim.spec dlls/d3dim/Makefile
 	@cd dlls/d3dim && \$(MAKE) \`basename \$@\`
 dlls/d3dim dlls/d3dim/__install__ dlls/d3dim/__install-lib__ dlls/d3dim/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dim/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dim"
 test "x$enable_d3dim" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dim"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14753,8 +14753,8 @@ dlls/d3drm/libd3drm.$IMPLIBEXT dlls/d3drm/libd3drm.cross.a: tools/widl tools/win
 dlls/d3drm/libd3drm.$IMPLIBEXT dlls/d3drm/libd3drm.cross.a: dlls/d3drm/d3drm.spec dlls/d3drm/Makefile
 	@cd dlls/d3drm && \$(MAKE) \`basename \$@\`
 dlls/d3drm dlls/d3drm/__install__ dlls/d3drm/__install-lib__ dlls/d3drm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3drm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3drm"
 test "x$enable_d3drm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3drm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14773,8 +14773,8 @@ d3drm_test.exe: \$(TOPOBJDIR)/dlls/d3drm/tests/d3drm_test.exe$DLLEXT
 d3drm_test.rc:
 	echo \"d3drm_test.exe TESTRES \\\"d3drm_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3drm_test.res: d3drm_test.rc d3drm_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3drm/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3drm/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3drm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14784,8 +14784,8 @@ ac_config_files="$ac_config_files dlls/d3drm/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_24 dlls/d3dx9_24/__install__ dlls/d3dx9_24/__install-lib__ dlls/d3dx9_24/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_24/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_24"
 test "x$enable_d3dx9_24" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_24"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14795,8 +14795,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_24/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_25 dlls/d3dx9_25/__install__ dlls/d3dx9_25/__install-lib__ dlls/d3dx9_25/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_25/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_25"
 test "x$enable_d3dx9_25" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_25"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14806,8 +14806,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_25/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_26 dlls/d3dx9_26/__install__ dlls/d3dx9_26/__install-lib__ dlls/d3dx9_26/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_26/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_26"
 test "x$enable_d3dx9_26" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_26"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14817,8 +14817,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_26/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_27 dlls/d3dx9_27/__install__ dlls/d3dx9_27/__install-lib__ dlls/d3dx9_27/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_27/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_27"
 test "x$enable_d3dx9_27" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_27"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14828,8 +14828,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_27/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_28 dlls/d3dx9_28/__install__ dlls/d3dx9_28/__install-lib__ dlls/d3dx9_28/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_28/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_28"
 test "x$enable_d3dx9_28" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_28"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14839,8 +14839,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_28/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_29 dlls/d3dx9_29/__install__ dlls/d3dx9_29/__install-lib__ dlls/d3dx9_29/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_29/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_29"
 test "x$enable_d3dx9_29" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_29"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14850,8 +14850,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_29/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_30 dlls/d3dx9_30/__install__ dlls/d3dx9_30/__install-lib__ dlls/d3dx9_30/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_30/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_30"
 test "x$enable_d3dx9_30" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_30"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14861,8 +14861,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_30/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_31 dlls/d3dx9_31/__install__ dlls/d3dx9_31/__install-lib__ dlls/d3dx9_31/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_31/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_31"
 test "x$enable_d3dx9_31" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_31"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14872,8 +14872,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_31/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_32 dlls/d3dx9_32/__install__ dlls/d3dx9_32/__install-lib__ dlls/d3dx9_32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_32"
 test "x$enable_d3dx9_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14883,8 +14883,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_33 dlls/d3dx9_33/__install__ dlls/d3dx9_33/__install-lib__ dlls/d3dx9_33/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_33/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_33"
 test "x$enable_d3dx9_33" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_33"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14894,8 +14894,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_33/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_34 dlls/d3dx9_34/__install__ dlls/d3dx9_34/__install-lib__ dlls/d3dx9_34/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_34/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_34"
 test "x$enable_d3dx9_34" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_34"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14905,8 +14905,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_34/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_35 dlls/d3dx9_35/__install__ dlls/d3dx9_35/__install-lib__ dlls/d3dx9_35/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_35/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_35"
 test "x$enable_d3dx9_35" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_35"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14928,8 +14928,8 @@ clean::
 dlls/d3dx9_36/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.cross.a: dlls/d3dx9_36/d3dx9_36.spec dlls/d3dx9_36/Makefile
 	@cd dlls/d3dx9_36 && \$(MAKE) \`basename \$@\`
 dlls/d3dx9_36 dlls/d3dx9_36/__install__ dlls/d3dx9_36/__install-lib__ dlls/d3dx9_36/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_36/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_36"
 test "x$enable_d3dx9_36" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_36"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14948,8 +14948,8 @@ d3dx9_36_test.exe: \$(TOPOBJDIR)/dlls/d3dx9_36/tests/d3dx9_36_test.exe$DLLEXT
 d3dx9_36_test.rc:
 	echo \"d3dx9_36_test.exe TESTRES \\\"d3dx9_36_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3dx9_36_test.res: d3dx9_36_test.rc d3dx9_36_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_36/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_36/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3dx9_36/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14959,8 +14959,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_36/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_37 dlls/d3dx9_37/__install__ dlls/d3dx9_37/__install-lib__ dlls/d3dx9_37/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_37/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_37"
 test "x$enable_d3dx9_37" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_37"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14970,8 +14970,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_37/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_38 dlls/d3dx9_38/__install__ dlls/d3dx9_38/__install-lib__ dlls/d3dx9_38/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_38/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_38"
 test "x$enable_d3dx9_38" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_38"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14981,8 +14981,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_38/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_39 dlls/d3dx9_39/__install__ dlls/d3dx9_39/__install-lib__ dlls/d3dx9_39/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_39/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_39"
 test "x$enable_d3dx9_39" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_39"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -14992,8 +14992,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_39/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_40 dlls/d3dx9_40/__install__ dlls/d3dx9_40/__install-lib__ dlls/d3dx9_40/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_40/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_40"
 test "x$enable_d3dx9_40" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_40"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15003,8 +15003,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_40/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_41 dlls/d3dx9_41/__install__ dlls/d3dx9_41/__install-lib__ dlls/d3dx9_41/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_41/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_41"
 test "x$enable_d3dx9_41" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_41"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15014,8 +15014,8 @@ ac_config_files="$ac_config_files dlls/d3dx9_41/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_42 dlls/d3dx9_42/__install__ dlls/d3dx9_42/__install-lib__ dlls/d3dx9_42/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dx9_42/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dx9_42"
 test "x$enable_d3dx9_42" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dx9_42"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15030,8 +15030,8 @@ dlls/d3dxof/libd3dxof.$IMPLIBEXT dlls/d3dxof/libd3dxof.cross.a: tools/widl tools
 dlls/d3dxof/libd3dxof.$IMPLIBEXT dlls/d3dxof/libd3dxof.cross.a: dlls/d3dxof/d3dxof.spec dlls/d3dxof/Makefile
 	@cd dlls/d3dxof && \$(MAKE) \`basename \$@\`
 dlls/d3dxof dlls/d3dxof/__install__ dlls/d3dxof/__install-lib__ dlls/d3dxof/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dxof/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dxof"
 test "x$enable_d3dxof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/d3dxof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15050,8 +15050,8 @@ d3dxof_test.exe: \$(TOPOBJDIR)/dlls/d3dxof/tests/d3dxof_test.exe$DLLEXT
 d3dxof_test.rc:
 	echo \"d3dxof_test.exe TESTRES \\\"d3dxof_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 d3dxof_test.res: d3dxof_test.rc d3dxof_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/d3dxof/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/d3dxof/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/d3dxof/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15066,8 +15066,8 @@ dlls/dbghelp/libdbghelp.$IMPLIBEXT dlls/dbghelp/libdbghelp.cross.a: tools/widl t
 dlls/dbghelp/libdbghelp.$IMPLIBEXT dlls/dbghelp/libdbghelp.cross.a: dlls/dbghelp/dbghelp.spec dlls/dbghelp/Makefile
 	@cd dlls/dbghelp && \$(MAKE) \`basename \$@\`
 dlls/dbghelp dlls/dbghelp/__install__ dlls/dbghelp/__install-lib__ dlls/dbghelp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dbghelp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dbghelp"
 test "x$enable_dbghelp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dbghelp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15082,8 +15082,8 @@ dlls/dciman32/libdciman32.$IMPLIBEXT dlls/dciman32/libdciman32.cross.a: tools/wi
 dlls/dciman32/libdciman32.$IMPLIBEXT dlls/dciman32/libdciman32.cross.a: dlls/dciman32/dciman32.spec dlls/dciman32/Makefile
 	@cd dlls/dciman32 && \$(MAKE) \`basename \$@\`
 dlls/dciman32 dlls/dciman32/__install__ dlls/dciman32/__install-lib__ dlls/dciman32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dciman32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dciman32"
 test "x$enable_dciman32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dciman32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15093,8 +15093,8 @@ ac_config_files="$ac_config_files dlls/dciman32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddeml.dll16 dlls/ddeml.dll16/__install__ dlls/ddeml.dll16/__install-lib__ dlls/ddeml.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ddeml.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ddeml.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ddeml.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15109,8 +15109,8 @@ dlls/ddraw/libddraw.$IMPLIBEXT dlls/ddraw/libddraw.cross.a: tools/widl tools/win
 dlls/ddraw/libddraw.$IMPLIBEXT dlls/ddraw/libddraw.cross.a: dlls/ddraw/ddraw.spec dlls/ddraw/Makefile
 	@cd dlls/ddraw && \$(MAKE) \`basename \$@\`
 dlls/ddraw dlls/ddraw/__install__ dlls/ddraw/__install-lib__ dlls/ddraw/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ddraw/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ddraw"
 test "x$enable_ddraw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ddraw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15129,8 +15129,8 @@ ddraw_test.exe: \$(TOPOBJDIR)/dlls/ddraw/tests/ddraw_test.exe$DLLEXT
 ddraw_test.rc:
 	echo \"ddraw_test.exe TESTRES \\\"ddraw_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ddraw_test.res: ddraw_test.rc ddraw_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ddraw/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ddraw/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ddraw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15140,8 +15140,8 @@ ac_config_files="$ac_config_files dlls/ddraw/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddrawex dlls/ddrawex/__install__ dlls/ddrawex/__install-lib__ dlls/ddrawex/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ddrawex/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ddrawex"
 test "x$enable_ddrawex" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ddrawex"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15160,8 +15160,8 @@ ddrawex_test.exe: \$(TOPOBJDIR)/dlls/ddrawex/tests/ddrawex_test.exe$DLLEXT
 ddrawex_test.rc:
 	echo \"ddrawex_test.exe TESTRES \\\"ddrawex_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ddrawex_test.res: ddrawex_test.rc ddrawex_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ddrawex/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ddrawex/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ddrawex/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15171,8 +15171,8 @@ ac_config_files="$ac_config_files dlls/ddrawex/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/devenum dlls/devenum/__install__ dlls/devenum/__install-lib__ dlls/devenum/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/devenum/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/devenum"
 test "x$enable_devenum" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/devenum"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15190,8 +15190,8 @@ dlls/dinput/libdinput.def: dlls/dinput/dinput.spec dlls/dinput/Makefile
 dlls/dinput/libdinput.$STATIC_IMPLIBEXT dlls/dinput/libdinput.cross.a: dlls/dinput/Makefile dummy
 	@cd dlls/dinput && \$(MAKE) \`basename \$@\`
 dlls/dinput dlls/dinput/__install__ dlls/dinput/__install-lib__ dlls/dinput/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dinput/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dinput"
 test "x$enable_dinput" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dinput"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15210,8 +15210,8 @@ dinput_test.exe: \$(TOPOBJDIR)/dlls/dinput/tests/dinput_test.exe$DLLEXT
 dinput_test.rc:
 	echo \"dinput_test.exe TESTRES \\\"dinput_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dinput_test.res: dinput_test.rc dinput_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dinput/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dinput/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dinput/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15226,8 +15226,8 @@ dlls/dinput8/libdinput8.$IMPLIBEXT dlls/dinput8/libdinput8.cross.a: tools/widl t
 dlls/dinput8/libdinput8.$IMPLIBEXT dlls/dinput8/libdinput8.cross.a: dlls/dinput8/dinput8.spec dlls/dinput8/Makefile
 	@cd dlls/dinput8 && \$(MAKE) \`basename \$@\`
 dlls/dinput8 dlls/dinput8/__install__ dlls/dinput8/__install-lib__ dlls/dinput8/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dinput8/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dinput8"
 test "x$enable_dinput8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dinput8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15237,8 +15237,8 @@ ac_config_files="$ac_config_files dlls/dinput8/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dispdib.dll16 dlls/dispdib.dll16/__install__ dlls/dispdib.dll16/__install-lib__ dlls/dispdib.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dispdib.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dispdib.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dispdib.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15248,8 +15248,8 @@ ac_config_files="$ac_config_files dlls/dispdib.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/display.drv16 dlls/display.drv16/__install__ dlls/display.drv16/__install-lib__ dlls/display.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/display.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/display.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/display.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15259,8 +15259,8 @@ ac_config_files="$ac_config_files dlls/display.drv16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmband dlls/dmband/__install__ dlls/dmband/__install-lib__ dlls/dmband/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmband/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmband"
 test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmband"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15270,8 +15270,8 @@ ac_config_files="$ac_config_files dlls/dmband/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmcompos dlls/dmcompos/__install__ dlls/dmcompos/__install-lib__ dlls/dmcompos/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmcompos/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmcompos"
 test "x$enable_dmcompos" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmcompos"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15281,8 +15281,8 @@ ac_config_files="$ac_config_files dlls/dmcompos/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmime dlls/dmime/__install__ dlls/dmime/__install-lib__ dlls/dmime/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmime/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmime"
 test "x$enable_dmime" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmime"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15292,8 +15292,8 @@ ac_config_files="$ac_config_files dlls/dmime/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmloader dlls/dmloader/__install__ dlls/dmloader/__install-lib__ dlls/dmloader/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmloader/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmloader"
 test "x$enable_dmloader" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmloader"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15312,8 +15312,8 @@ dmloader_test.exe: \$(TOPOBJDIR)/dlls/dmloader/tests/dmloader_test.exe$DLLEXT
 dmloader_test.rc:
 	echo \"dmloader_test.exe TESTRES \\\"dmloader_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dmloader_test.res: dmloader_test.rc dmloader_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmloader/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmloader/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dmloader/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15323,8 +15323,8 @@ ac_config_files="$ac_config_files dlls/dmloader/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmscript dlls/dmscript/__install__ dlls/dmscript/__install-lib__ dlls/dmscript/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmscript/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmscript"
 test "x$enable_dmscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15334,8 +15334,8 @@ ac_config_files="$ac_config_files dlls/dmscript/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmstyle dlls/dmstyle/__install__ dlls/dmstyle/__install-lib__ dlls/dmstyle/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmstyle/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmstyle"
 test "x$enable_dmstyle" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmstyle"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15345,8 +15345,8 @@ ac_config_files="$ac_config_files dlls/dmstyle/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmsynth dlls/dmsynth/__install__ dlls/dmsynth/__install-lib__ dlls/dmsynth/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmsynth/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmsynth"
 test "x$enable_dmsynth" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmsynth"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15356,8 +15356,8 @@ ac_config_files="$ac_config_files dlls/dmsynth/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmusic dlls/dmusic/__install__ dlls/dmusic/__install-lib__ dlls/dmusic/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmusic/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmusic"
 test "x$enable_dmusic" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmusic"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15372,8 +15372,8 @@ dlls/dmusic32/libdmusic32.$IMPLIBEXT dlls/dmusic32/libdmusic32.cross.a: tools/wi
 dlls/dmusic32/libdmusic32.$IMPLIBEXT dlls/dmusic32/libdmusic32.cross.a: dlls/dmusic32/dmusic32.spec dlls/dmusic32/Makefile
 	@cd dlls/dmusic32 && \$(MAKE) \`basename \$@\`
 dlls/dmusic32 dlls/dmusic32/__install__ dlls/dmusic32/__install-lib__ dlls/dmusic32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dmusic32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dmusic32"
 test "x$enable_dmusic32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dmusic32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15388,8 +15388,8 @@ dlls/dnsapi/libdnsapi.$IMPLIBEXT dlls/dnsapi/libdnsapi.cross.a: tools/widl tools
 dlls/dnsapi/libdnsapi.$IMPLIBEXT dlls/dnsapi/libdnsapi.cross.a: dlls/dnsapi/dnsapi.spec dlls/dnsapi/Makefile
 	@cd dlls/dnsapi && \$(MAKE) \`basename \$@\`
 dlls/dnsapi dlls/dnsapi/__install__ dlls/dnsapi/__install-lib__ dlls/dnsapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dnsapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dnsapi"
 test "x$enable_dnsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dnsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15408,8 +15408,8 @@ dnsapi_test.exe: \$(TOPOBJDIR)/dlls/dnsapi/tests/dnsapi_test.exe$DLLEXT
 dnsapi_test.rc:
 	echo \"dnsapi_test.exe TESTRES \\\"dnsapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dnsapi_test.res: dnsapi_test.rc dnsapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dnsapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dnsapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dnsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15424,8 +15424,8 @@ dlls/dplay/libdplay.$IMPLIBEXT dlls/dplay/libdplay.cross.a: tools/widl tools/win
 dlls/dplay/libdplay.$IMPLIBEXT dlls/dplay/libdplay.cross.a: dlls/dplay/dplay.spec dlls/dplay/Makefile
 	@cd dlls/dplay && \$(MAKE) \`basename \$@\`
 dlls/dplay dlls/dplay/__install__ dlls/dplay/__install-lib__ dlls/dplay/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dplay/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dplay"
 test "x$enable_dplay" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dplay"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15440,8 +15440,8 @@ dlls/dplayx/libdplayx.$IMPLIBEXT dlls/dplayx/libdplayx.cross.a: tools/widl tools
 dlls/dplayx/libdplayx.$IMPLIBEXT dlls/dplayx/libdplayx.cross.a: dlls/dplayx/dplayx.spec dlls/dplayx/Makefile
 	@cd dlls/dplayx && \$(MAKE) \`basename \$@\`
 dlls/dplayx dlls/dplayx/__install__ dlls/dplayx/__install-lib__ dlls/dplayx/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dplayx/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dplayx"
 test "x$enable_dplayx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dplayx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15460,8 +15460,8 @@ dplayx_test.exe: \$(TOPOBJDIR)/dlls/dplayx/tests/dplayx_test.exe$DLLEXT
 dplayx_test.rc:
 	echo \"dplayx_test.exe TESTRES \\\"dplayx_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dplayx_test.res: dplayx_test.rc dplayx_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dplayx/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dplayx/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dplayx/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15471,8 +15471,8 @@ ac_config_files="$ac_config_files dlls/dplayx/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnaddr dlls/dpnaddr/__install__ dlls/dpnaddr/__install-lib__ dlls/dpnaddr/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dpnaddr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dpnaddr"
 test "x$enable_dpnaddr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dpnaddr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15487,8 +15487,8 @@ dlls/dpnet/libdpnet.$IMPLIBEXT dlls/dpnet/libdpnet.cross.a: tools/widl tools/win
 dlls/dpnet/libdpnet.$IMPLIBEXT dlls/dpnet/libdpnet.cross.a: dlls/dpnet/dpnet.spec dlls/dpnet/Makefile
 	@cd dlls/dpnet && \$(MAKE) \`basename \$@\`
 dlls/dpnet dlls/dpnet/__install__ dlls/dpnet/__install-lib__ dlls/dpnet/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dpnet/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dpnet"
 test "x$enable_dpnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dpnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15498,8 +15498,8 @@ ac_config_files="$ac_config_files dlls/dpnet/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnhpast dlls/dpnhpast/__install__ dlls/dpnhpast/__install-lib__ dlls/dpnhpast/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dpnhpast/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dpnhpast"
 test "x$enable_dpnhpast" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dpnhpast"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15509,8 +15509,8 @@ ac_config_files="$ac_config_files dlls/dpnhpast/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnlobby dlls/dpnlobby/__install__ dlls/dpnlobby/__install-lib__ dlls/dpnlobby/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dpnlobby/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dpnlobby"
 test "x$enable_dpnlobby" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dpnlobby"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15520,8 +15520,8 @@ ac_config_files="$ac_config_files dlls/dpnlobby/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpwsockx dlls/dpwsockx/__install__ dlls/dpwsockx/__install-lib__ dlls/dpwsockx/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dpwsockx/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dpwsockx"
 test "x$enable_dpwsockx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dpwsockx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15531,8 +15531,8 @@ ac_config_files="$ac_config_files dlls/dpwsockx/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/drmclien dlls/drmclien/__install__ dlls/drmclien/__install-lib__ dlls/drmclien/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/drmclien/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/drmclien"
 test "x$enable_drmclien" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/drmclien"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15547,8 +15547,8 @@ dlls/dsound/libdsound.$IMPLIBEXT dlls/dsound/libdsound.cross.a: tools/widl tools
 dlls/dsound/libdsound.$IMPLIBEXT dlls/dsound/libdsound.cross.a: dlls/dsound/dsound.spec dlls/dsound/Makefile
 	@cd dlls/dsound && \$(MAKE) \`basename \$@\`
 dlls/dsound dlls/dsound/__install__ dlls/dsound/__install-lib__ dlls/dsound/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dsound/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dsound"
 test "x$enable_dsound" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dsound"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15567,8 +15567,8 @@ dsound_test.exe: \$(TOPOBJDIR)/dlls/dsound/tests/dsound_test.exe$DLLEXT
 dsound_test.rc:
 	echo \"dsound_test.exe TESTRES \\\"dsound_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dsound_test.res: dsound_test.rc dsound_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dsound/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dsound/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dsound/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15578,8 +15578,8 @@ ac_config_files="$ac_config_files dlls/dsound/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dssenh dlls/dssenh/__install__ dlls/dssenh/__install-lib__ dlls/dssenh/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dssenh/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dssenh"
 test "x$enable_dssenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dssenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15589,8 +15589,8 @@ ac_config_files="$ac_config_files dlls/dssenh/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dswave dlls/dswave/__install__ dlls/dswave/__install-lib__ dlls/dswave/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dswave/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dswave"
 test "x$enable_dswave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dswave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15605,8 +15605,8 @@ dlls/dwmapi/libdwmapi.$IMPLIBEXT dlls/dwmapi/libdwmapi.cross.a: tools/widl tools
 dlls/dwmapi/libdwmapi.$IMPLIBEXT dlls/dwmapi/libdwmapi.cross.a: dlls/dwmapi/dwmapi.spec dlls/dwmapi/Makefile
 	@cd dlls/dwmapi && \$(MAKE) \`basename \$@\`
 dlls/dwmapi dlls/dwmapi/__install__ dlls/dwmapi/__install-lib__ dlls/dwmapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dwmapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dwmapi"
 test "x$enable_dwmapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dwmapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15616,8 +15616,8 @@ ac_config_files="$ac_config_files dlls/dwmapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxdiagn dlls/dxdiagn/__install__ dlls/dxdiagn/__install-lib__ dlls/dxdiagn/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxdiagn/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxdiagn"
 test "x$enable_dxdiagn" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dxdiagn"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15636,8 +15636,8 @@ dxdiagn_test.exe: \$(TOPOBJDIR)/dlls/dxdiagn/tests/dxdiagn_test.exe$DLLEXT
 dxdiagn_test.rc:
 	echo \"dxdiagn_test.exe TESTRES \\\"dxdiagn_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dxdiagn_test.res: dxdiagn_test.rc dxdiagn_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxdiagn/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxdiagn/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dxdiagn/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15652,8 +15652,8 @@ dlls/dxerr8: tools/widl tools/winebuild tools/winegcc include
 dlls/dxerr8/__install__ dlls/dxerr8/__install-dev__: dlls/dxerr8
 dlls/dxerr8/libdxerr8.cross.a: dlls/dxerr8/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/dxerr8 && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxerr8/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxerr8"
 test "x$enable_dxerr8" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/dxerr8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15668,8 +15668,8 @@ dlls/dxerr9: tools/widl tools/winebuild tools/winegcc include
 dlls/dxerr9/__install__ dlls/dxerr9/__install-dev__: dlls/dxerr9
 dlls/dxerr9/libdxerr9.cross.a: dlls/dxerr9/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/dxerr9 && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxerr9/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxerr9"
 test "x$enable_dxerr9" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/dxerr9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15684,8 +15684,8 @@ dlls/dxgi/libdxgi.$IMPLIBEXT dlls/dxgi/libdxgi.cross.a: tools/widl tools/winebui
 dlls/dxgi/libdxgi.$IMPLIBEXT dlls/dxgi/libdxgi.cross.a: dlls/dxgi/dxgi.spec dlls/dxgi/Makefile
 	@cd dlls/dxgi && \$(MAKE) \`basename \$@\`
 dlls/dxgi dlls/dxgi/__install__ dlls/dxgi/__install-lib__ dlls/dxgi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxgi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxgi"
 test "x$enable_dxgi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/dxgi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15704,8 +15704,8 @@ dxgi_test.exe: \$(TOPOBJDIR)/dlls/dxgi/tests/dxgi_test.exe$DLLEXT
 dxgi_test.rc:
 	echo \"dxgi_test.exe TESTRES \\\"dxgi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 dxgi_test.res: dxgi_test.rc dxgi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxgi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxgi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/dxgi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15720,8 +15720,8 @@ dlls/dxguid: tools/widl tools/winebuild tools/winegcc include
 dlls/dxguid/__install__ dlls/dxguid/__install-dev__: dlls/dxguid
 dlls/dxguid/libdxguid.cross.a: dlls/dxguid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/dxguid && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/dxguid/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/dxguid"
 test "x$enable_dxguid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/dxguid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15731,8 +15731,8 @@ ac_config_files="$ac_config_files dlls/dxguid/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/faultrep dlls/faultrep/__install__ dlls/faultrep/__install-lib__ dlls/faultrep/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/faultrep/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/faultrep"
 test "x$enable_faultrep" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/faultrep"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15742,8 +15742,8 @@ ac_config_files="$ac_config_files dlls/faultrep/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fltlib dlls/fltlib/__install__ dlls/fltlib/__install-lib__ dlls/fltlib/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/fltlib/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/fltlib"
 test "x$enable_fltlib" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/fltlib"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15753,8 +15753,8 @@ ac_config_files="$ac_config_files dlls/fltlib/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fusion dlls/fusion/__install__ dlls/fusion/__install-lib__ dlls/fusion/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/fusion/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/fusion"
 test "x$enable_fusion" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/fusion"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15773,8 +15773,8 @@ fusion_test.exe: \$(TOPOBJDIR)/dlls/fusion/tests/fusion_test.exe$DLLEXT
 fusion_test.rc:
 	echo \"fusion_test.exe TESTRES \\\"fusion_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 fusion_test.res: fusion_test.rc fusion_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/fusion/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/fusion/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/fusion/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15784,8 +15784,8 @@ ac_config_files="$ac_config_files dlls/fusion/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fwpuclnt dlls/fwpuclnt/__install__ dlls/fwpuclnt/__install-lib__ dlls/fwpuclnt/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/fwpuclnt/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/fwpuclnt"
 test "x$enable_fwpuclnt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/fwpuclnt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15795,8 +15795,8 @@ ac_config_files="$ac_config_files dlls/fwpuclnt/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdi.exe16 dlls/gdi.exe16/__install__ dlls/gdi.exe16/__install-lib__ dlls/gdi.exe16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gdi.exe16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gdi.exe16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/gdi.exe16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15811,8 +15811,8 @@ dlls/gdi32/libgdi32.$IMPLIBEXT dlls/gdi32/libgdi32.cross.a: tools/widl tools/win
 dlls/gdi32/libgdi32.$IMPLIBEXT dlls/gdi32/libgdi32.cross.a: dlls/gdi32/gdi32.spec dlls/gdi32/Makefile
 	@cd dlls/gdi32 && \$(MAKE) \`basename \$@\`
 dlls/gdi32 dlls/gdi32/__install__ dlls/gdi32/__install-lib__ dlls/gdi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gdi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gdi32"
 test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/gdi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15831,8 +15831,8 @@ gdi32_test.exe: \$(TOPOBJDIR)/dlls/gdi32/tests/gdi32_test.exe$DLLEXT
 gdi32_test.rc:
 	echo \"gdi32_test.exe TESTRES \\\"gdi32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 gdi32_test.res: gdi32_test.rc gdi32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gdi32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gdi32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/gdi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15847,8 +15847,8 @@ dlls/gdiplus/libgdiplus.$IMPLIBEXT dlls/gdiplus/libgdiplus.cross.a: tools/widl t
 dlls/gdiplus/libgdiplus.$IMPLIBEXT dlls/gdiplus/libgdiplus.cross.a: dlls/gdiplus/gdiplus.spec dlls/gdiplus/Makefile
 	@cd dlls/gdiplus && \$(MAKE) \`basename \$@\`
 dlls/gdiplus dlls/gdiplus/__install__ dlls/gdiplus/__install-lib__ dlls/gdiplus/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gdiplus/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gdiplus"
 test "x$enable_gdiplus" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/gdiplus"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15867,8 +15867,8 @@ gdiplus_test.exe: \$(TOPOBJDIR)/dlls/gdiplus/tests/gdiplus_test.exe$DLLEXT
 gdiplus_test.rc:
 	echo \"gdiplus_test.exe TESTRES \\\"gdiplus_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 gdiplus_test.res: gdiplus_test.rc gdiplus_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gdiplus/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gdiplus/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/gdiplus/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15883,8 +15883,8 @@ dlls/glu32/libglu32.$IMPLIBEXT dlls/glu32/libglu32.cross.a: tools/widl tools/win
 dlls/glu32/libglu32.$IMPLIBEXT dlls/glu32/libglu32.cross.a: dlls/glu32/glu32.spec dlls/glu32/Makefile
 	@cd dlls/glu32 && \$(MAKE) \`basename \$@\`
 dlls/glu32 dlls/glu32/__install__ dlls/glu32/__install-lib__ dlls/glu32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/glu32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/glu32"
 test "x$enable_glu32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/glu32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15894,8 +15894,8 @@ ac_config_files="$ac_config_files dlls/glu32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gphoto2.ds dlls/gphoto2.ds/__install__ dlls/gphoto2.ds/__install-lib__ dlls/gphoto2.ds/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gphoto2.ds/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gphoto2.ds"
 test "x$enable_gphoto2_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/gphoto2.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15905,8 +15905,8 @@ ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gpkcsp dlls/gpkcsp/__install__ dlls/gpkcsp/__install-lib__ dlls/gpkcsp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/gpkcsp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/gpkcsp"
 test "x$enable_gpkcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/gpkcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15916,8 +15916,8 @@ ac_config_files="$ac_config_files dlls/gpkcsp/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hal dlls/hal/__install__ dlls/hal/__install-lib__ dlls/hal/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hal/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hal"
 test "x$enable_hal" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/hal"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15927,8 +15927,8 @@ ac_config_files="$ac_config_files dlls/hal/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hhctrl.ocx dlls/hhctrl.ocx/__install__ dlls/hhctrl.ocx/__install-lib__ dlls/hhctrl.ocx/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hhctrl.ocx/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hhctrl.ocx"
 test "x$enable_hhctrl_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/hhctrl.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15943,8 +15943,8 @@ dlls/hid/libhid.$IMPLIBEXT dlls/hid/libhid.cross.a: tools/widl tools/winebuild t
 dlls/hid/libhid.$IMPLIBEXT dlls/hid/libhid.cross.a: dlls/hid/hid.spec dlls/hid/Makefile
 	@cd dlls/hid && \$(MAKE) \`basename \$@\`
 dlls/hid dlls/hid/__install__ dlls/hid/__install-lib__ dlls/hid/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hid/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hid"
 test "x$enable_hid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/hid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15959,8 +15959,8 @@ dlls/hlink/libhlink.$IMPLIBEXT dlls/hlink/libhlink.cross.a: tools/widl tools/win
 dlls/hlink/libhlink.$IMPLIBEXT dlls/hlink/libhlink.cross.a: dlls/hlink/hlink.spec dlls/hlink/Makefile
 	@cd dlls/hlink && \$(MAKE) \`basename \$@\`
 dlls/hlink dlls/hlink/__install__ dlls/hlink/__install-lib__ dlls/hlink/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hlink/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hlink"
 test "x$enable_hlink" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/hlink"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15979,8 +15979,8 @@ hlink_test.exe: \$(TOPOBJDIR)/dlls/hlink/tests/hlink_test.exe$DLLEXT
 hlink_test.rc:
 	echo \"hlink_test.exe TESTRES \\\"hlink_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 hlink_test.res: hlink_test.rc hlink_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hlink/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hlink/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/hlink/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -15990,8 +15990,8 @@ ac_config_files="$ac_config_files dlls/hlink/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hnetcfg dlls/hnetcfg/__install__ dlls/hnetcfg/__install-lib__ dlls/hnetcfg/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/hnetcfg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/hnetcfg"
 test "x$enable_hnetcfg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/hnetcfg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16001,8 +16001,8 @@ ac_config_files="$ac_config_files dlls/hnetcfg/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/httpapi dlls/httpapi/__install__ dlls/httpapi/__install-lib__ dlls/httpapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/httpapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/httpapi"
 test "x$enable_httpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/httpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16012,8 +16012,8 @@ ac_config_files="$ac_config_files dlls/httpapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iccvid dlls/iccvid/__install__ dlls/iccvid/__install-lib__ dlls/iccvid/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/iccvid/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/iccvid"
 test "x$enable_iccvid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/iccvid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16023,8 +16023,8 @@ ac_config_files="$ac_config_files dlls/iccvid/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/icmp dlls/icmp/__install__ dlls/icmp/__install-lib__ dlls/icmp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/icmp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/icmp"
 test "x$enable_icmp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/icmp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16034,8 +16034,8 @@ ac_config_files="$ac_config_files dlls/icmp/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ifsmgr.vxd dlls/ifsmgr.vxd/__install__ dlls/ifsmgr.vxd/__install-lib__ dlls/ifsmgr.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ifsmgr.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ifsmgr.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ifsmgr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16045,8 +16045,8 @@ ac_config_files="$ac_config_files dlls/ifsmgr.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imaadp32.acm dlls/imaadp32.acm/__install__ dlls/imaadp32.acm/__install-lib__ dlls/imaadp32.acm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imaadp32.acm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imaadp32.acm"
 test "x$enable_imaadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/imaadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16061,8 +16061,8 @@ dlls/imagehlp/libimagehlp.$IMPLIBEXT dlls/imagehlp/libimagehlp.cross.a: tools/wi
 dlls/imagehlp/libimagehlp.$IMPLIBEXT dlls/imagehlp/libimagehlp.cross.a: dlls/imagehlp/imagehlp.spec dlls/imagehlp/Makefile
 	@cd dlls/imagehlp && \$(MAKE) \`basename \$@\`
 dlls/imagehlp dlls/imagehlp/__install__ dlls/imagehlp/__install-lib__ dlls/imagehlp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imagehlp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imagehlp"
 test "x$enable_imagehlp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/imagehlp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16081,8 +16081,8 @@ imagehlp_test.exe: \$(TOPOBJDIR)/dlls/imagehlp/tests/imagehlp_test.exe$DLLEXT
 imagehlp_test.rc:
 	echo \"imagehlp_test.exe TESTRES \\\"imagehlp_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 imagehlp_test.res: imagehlp_test.rc imagehlp_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imagehlp/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imagehlp/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/imagehlp/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16092,8 +16092,8 @@ ac_config_files="$ac_config_files dlls/imagehlp/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imm.dll16 dlls/imm.dll16/__install__ dlls/imm.dll16/__install-lib__ dlls/imm.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imm.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imm.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/imm.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16108,8 +16108,8 @@ dlls/imm32/libimm32.$IMPLIBEXT dlls/imm32/libimm32.cross.a: tools/widl tools/win
 dlls/imm32/libimm32.$IMPLIBEXT dlls/imm32/libimm32.cross.a: dlls/imm32/imm32.spec dlls/imm32/Makefile
 	@cd dlls/imm32 && \$(MAKE) \`basename \$@\`
 dlls/imm32 dlls/imm32/__install__ dlls/imm32/__install-lib__ dlls/imm32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imm32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imm32"
 test "x$enable_imm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/imm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16128,8 +16128,8 @@ imm32_test.exe: \$(TOPOBJDIR)/dlls/imm32/tests/imm32_test.exe$DLLEXT
 imm32_test.rc:
 	echo \"imm32_test.exe TESTRES \\\"imm32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 imm32_test.res: imm32_test.rc imm32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/imm32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/imm32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/imm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16144,8 +16144,8 @@ dlls/inetcomm/libinetcomm.$IMPLIBEXT dlls/inetcomm/libinetcomm.cross.a: tools/wi
 dlls/inetcomm/libinetcomm.$IMPLIBEXT dlls/inetcomm/libinetcomm.cross.a: dlls/inetcomm/inetcomm.spec dlls/inetcomm/Makefile
 	@cd dlls/inetcomm && \$(MAKE) \`basename \$@\`
 dlls/inetcomm dlls/inetcomm/__install__ dlls/inetcomm/__install-lib__ dlls/inetcomm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inetcomm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inetcomm"
 test "x$enable_inetcomm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/inetcomm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16164,8 +16164,8 @@ inetcomm_test.exe: \$(TOPOBJDIR)/dlls/inetcomm/tests/inetcomm_test.exe$DLLEXT
 inetcomm_test.rc:
 	echo \"inetcomm_test.exe TESTRES \\\"inetcomm_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 inetcomm_test.res: inetcomm_test.rc inetcomm_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inetcomm/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inetcomm/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/inetcomm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16175,8 +16175,8 @@ ac_config_files="$ac_config_files dlls/inetcomm/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetmib1 dlls/inetmib1/__install__ dlls/inetmib1/__install-lib__ dlls/inetmib1/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inetmib1/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inetmib1"
 test "x$enable_inetmib1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/inetmib1"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16195,8 +16195,8 @@ inetmib1_test.exe: \$(TOPOBJDIR)/dlls/inetmib1/tests/inetmib1_test.exe$DLLEXT
 inetmib1_test.rc:
 	echo \"inetmib1_test.exe TESTRES \\\"inetmib1_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 inetmib1_test.res: inetmib1_test.rc inetmib1_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inetmib1/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inetmib1/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/inetmib1/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16206,8 +16206,8 @@ ac_config_files="$ac_config_files dlls/inetmib1/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/infosoft dlls/infosoft/__install__ dlls/infosoft/__install-lib__ dlls/infosoft/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/infosoft/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/infosoft"
 test "x$enable_infosoft" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/infosoft"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16226,8 +16226,8 @@ infosoft_test.exe: \$(TOPOBJDIR)/dlls/infosoft/tests/infosoft_test.exe$DLLEXT
 infosoft_test.rc:
 	echo \"infosoft_test.exe TESTRES \\\"infosoft_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 infosoft_test.res: infosoft_test.rc infosoft_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/infosoft/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/infosoft/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/infosoft/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16237,8 +16237,8 @@ ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/initpki dlls/initpki/__install__ dlls/initpki/__install-lib__ dlls/initpki/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/initpki/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/initpki"
 test "x$enable_initpki" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/initpki"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16248,8 +16248,8 @@ ac_config_files="$ac_config_files dlls/initpki/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inkobj dlls/inkobj/__install__ dlls/inkobj/__install-lib__ dlls/inkobj/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inkobj/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inkobj"
 test "x$enable_inkobj" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/inkobj"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16259,8 +16259,8 @@ ac_config_files="$ac_config_files dlls/inkobj/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inseng dlls/inseng/__install__ dlls/inseng/__install-lib__ dlls/inseng/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/inseng/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/inseng"
 test "x$enable_inseng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/inseng"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16275,8 +16275,8 @@ dlls/iphlpapi/libiphlpapi.$IMPLIBEXT dlls/iphlpapi/libiphlpapi.cross.a: tools/wi
 dlls/iphlpapi/libiphlpapi.$IMPLIBEXT dlls/iphlpapi/libiphlpapi.cross.a: dlls/iphlpapi/iphlpapi.spec dlls/iphlpapi/Makefile
 	@cd dlls/iphlpapi && \$(MAKE) \`basename \$@\`
 dlls/iphlpapi dlls/iphlpapi/__install__ dlls/iphlpapi/__install-lib__ dlls/iphlpapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/iphlpapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/iphlpapi"
 test "x$enable_iphlpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/iphlpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16295,8 +16295,8 @@ iphlpapi_test.exe: \$(TOPOBJDIR)/dlls/iphlpapi/tests/iphlpapi_test.exe$DLLEXT
 iphlpapi_test.rc:
 	echo \"iphlpapi_test.exe TESTRES \\\"iphlpapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 iphlpapi_test.res: iphlpapi_test.rc iphlpapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/iphlpapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/iphlpapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/iphlpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16306,8 +16306,8 @@ ac_config_files="$ac_config_files dlls/iphlpapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itircl dlls/itircl/__install__ dlls/itircl/__install-lib__ dlls/itircl/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/itircl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/itircl"
 test "x$enable_itircl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/itircl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16317,8 +16317,8 @@ ac_config_files="$ac_config_files dlls/itircl/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itss dlls/itss/__install__ dlls/itss/__install-lib__ dlls/itss/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/itss/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/itss"
 test "x$enable_itss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/itss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16337,8 +16337,8 @@ itss_test.exe: \$(TOPOBJDIR)/dlls/itss/tests/itss_test.exe$DLLEXT
 itss_test.rc:
 	echo \"itss_test.exe TESTRES \\\"itss_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 itss_test.res: itss_test.rc itss_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/itss/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/itss/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/itss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16348,8 +16348,8 @@ ac_config_files="$ac_config_files dlls/itss/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/jscript dlls/jscript/__install__ dlls/jscript/__install-lib__ dlls/jscript/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/jscript/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/jscript"
 test "x$enable_jscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/jscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16368,8 +16368,8 @@ jscript_test.exe: \$(TOPOBJDIR)/dlls/jscript/tests/jscript_test.exe$DLLEXT
 jscript_test.rc:
 	echo \"jscript_test.exe TESTRES \\\"jscript_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 jscript_test.res: jscript_test.rc jscript_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/jscript/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/jscript/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/jscript/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16384,8 +16384,8 @@ dlls/kernel32/libkernel32.$IMPLIBEXT dlls/kernel32/libkernel32.cross.a: tools/wi
 dlls/kernel32/libkernel32.$IMPLIBEXT dlls/kernel32/libkernel32.cross.a: dlls/kernel32/kernel32.spec dlls/kernel32/Makefile
 	@cd dlls/kernel32 && \$(MAKE) \`basename \$@\`
 dlls/kernel32 dlls/kernel32/__install__ dlls/kernel32/__install-lib__ dlls/kernel32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/kernel32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/kernel32"
 test "x$enable_kernel32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/kernel32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16404,8 +16404,8 @@ kernel32_test.exe: \$(TOPOBJDIR)/dlls/kernel32/tests/kernel32_test.exe$DLLEXT
 kernel32_test.rc:
 	echo \"kernel32_test.exe TESTRES \\\"kernel32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 kernel32_test.res: kernel32_test.rc kernel32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/kernel32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/kernel32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/kernel32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16415,8 +16415,8 @@ ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/keyboard.drv16 dlls/keyboard.drv16/__install__ dlls/keyboard.drv16/__install-lib__ dlls/keyboard.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/keyboard.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/keyboard.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/keyboard.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16438,8 +16438,8 @@ clean::
 dlls/krnl386.exe16/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.cross.a: dlls/krnl386.exe16/krnl386.exe16.spec dlls/krnl386.exe16/Makefile
 	@cd dlls/krnl386.exe16 && \$(MAKE) \`basename \$@\`
 dlls/krnl386.exe16 dlls/krnl386.exe16/__install__ dlls/krnl386.exe16/__install-lib__ dlls/krnl386.exe16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/krnl386.exe16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/krnl386.exe16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/krnl386.exe16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16454,8 +16454,8 @@ dlls/loadperf/libloadperf.$IMPLIBEXT dlls/loadperf/libloadperf.cross.a: tools/wi
 dlls/loadperf/libloadperf.$IMPLIBEXT dlls/loadperf/libloadperf.cross.a: dlls/loadperf/loadperf.spec dlls/loadperf/Makefile
 	@cd dlls/loadperf && \$(MAKE) \`basename \$@\`
 dlls/loadperf dlls/loadperf/__install__ dlls/loadperf/__install-lib__ dlls/loadperf/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/loadperf/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/loadperf"
 test "x$enable_loadperf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/loadperf"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16465,8 +16465,8 @@ ac_config_files="$ac_config_files dlls/loadperf/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localspl dlls/localspl/__install__ dlls/localspl/__install-lib__ dlls/localspl/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/localspl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/localspl"
 test "x$enable_localspl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/localspl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16485,8 +16485,8 @@ localspl_test.exe: \$(TOPOBJDIR)/dlls/localspl/tests/localspl_test.exe$DLLEXT
 localspl_test.rc:
 	echo \"localspl_test.exe TESTRES \\\"localspl_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 localspl_test.res: localspl_test.rc localspl_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/localspl/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/localspl/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/localspl/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16496,8 +16496,8 @@ ac_config_files="$ac_config_files dlls/localspl/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localui dlls/localui/__install__ dlls/localui/__install-lib__ dlls/localui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/localui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/localui"
 test "x$enable_localui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/localui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16516,8 +16516,8 @@ localui_test.exe: \$(TOPOBJDIR)/dlls/localui/tests/localui_test.exe$DLLEXT
 localui_test.rc:
 	echo \"localui_test.exe TESTRES \\\"localui_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 localui_test.res: localui_test.rc localui_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/localui/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/localui/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/localui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16532,8 +16532,8 @@ dlls/lz32/liblz32.$IMPLIBEXT dlls/lz32/liblz32.cross.a: tools/widl tools/winebui
 dlls/lz32/liblz32.$IMPLIBEXT dlls/lz32/liblz32.cross.a: dlls/lz32/lz32.spec dlls/lz32/Makefile
 	@cd dlls/lz32 && \$(MAKE) \`basename \$@\`
 dlls/lz32 dlls/lz32/__install__ dlls/lz32/__install-lib__ dlls/lz32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/lz32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/lz32"
 test "x$enable_lz32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/lz32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16552,8 +16552,8 @@ lz32_test.exe: \$(TOPOBJDIR)/dlls/lz32/tests/lz32_test.exe$DLLEXT
 lz32_test.rc:
 	echo \"lz32_test.exe TESTRES \\\"lz32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 lz32_test.res: lz32_test.rc lz32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/lz32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/lz32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/lz32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16563,8 +16563,8 @@ ac_config_files="$ac_config_files dlls/lz32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lzexpand.dll16 dlls/lzexpand.dll16/__install__ dlls/lzexpand.dll16/__install-lib__ dlls/lzexpand.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/lzexpand.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/lzexpand.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/lzexpand.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16579,8 +16579,8 @@ dlls/mapi32/libmapi32.$IMPLIBEXT dlls/mapi32/libmapi32.cross.a: tools/widl tools
 dlls/mapi32/libmapi32.$IMPLIBEXT dlls/mapi32/libmapi32.cross.a: dlls/mapi32/mapi32.spec dlls/mapi32/Makefile
 	@cd dlls/mapi32 && \$(MAKE) \`basename \$@\`
 dlls/mapi32 dlls/mapi32/__install__ dlls/mapi32/__install-lib__ dlls/mapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mapi32"
 test "x$enable_mapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16599,8 +16599,8 @@ mapi32_test.exe: \$(TOPOBJDIR)/dlls/mapi32/tests/mapi32_test.exe$DLLEXT
 mapi32_test.rc:
 	echo \"mapi32_test.exe TESTRES \\\"mapi32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mapi32_test.res: mapi32_test.rc mapi32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mapi32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mapi32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16610,8 +16610,8 @@ ac_config_files="$ac_config_files dlls/mapi32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mapistub dlls/mapistub/__install__ dlls/mapistub/__install-lib__ dlls/mapistub/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mapistub/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mapistub"
 test "x$enable_mapistub" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mapistub"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16621,8 +16621,8 @@ ac_config_files="$ac_config_files dlls/mapistub/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciavi32 dlls/mciavi32/__install__ dlls/mciavi32/__install-lib__ dlls/mciavi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mciavi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mciavi32"
 test "x$enable_mciavi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mciavi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16632,8 +16632,8 @@ ac_config_files="$ac_config_files dlls/mciavi32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mcicda dlls/mcicda/__install__ dlls/mcicda/__install-lib__ dlls/mcicda/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mcicda/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mcicda"
 test "x$enable_mcicda" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mcicda"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16643,8 +16643,8 @@ ac_config_files="$ac_config_files dlls/mcicda/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciqtz32 dlls/mciqtz32/__install__ dlls/mciqtz32/__install-lib__ dlls/mciqtz32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mciqtz32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mciqtz32"
 test "x$enable_mciqtz32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mciqtz32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16654,8 +16654,8 @@ ac_config_files="$ac_config_files dlls/mciqtz32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciseq dlls/mciseq/__install__ dlls/mciseq/__install-lib__ dlls/mciseq/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mciseq/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mciseq"
 test "x$enable_mciseq" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mciseq"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16665,8 +16665,8 @@ ac_config_files="$ac_config_files dlls/mciseq/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciwave dlls/mciwave/__install__ dlls/mciwave/__install-lib__ dlls/mciwave/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mciwave/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mciwave"
 test "x$enable_mciwave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mciwave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16676,8 +16676,8 @@ ac_config_files="$ac_config_files dlls/mciwave/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/midimap dlls/midimap/__install__ dlls/midimap/__install-lib__ dlls/midimap/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/midimap/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/midimap"
 test "x$enable_midimap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/midimap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16692,8 +16692,8 @@ dlls/mlang/libmlang.$IMPLIBEXT dlls/mlang/libmlang.cross.a: tools/widl tools/win
 dlls/mlang/libmlang.$IMPLIBEXT dlls/mlang/libmlang.cross.a: dlls/mlang/mlang.spec dlls/mlang/Makefile
 	@cd dlls/mlang && \$(MAKE) \`basename \$@\`
 dlls/mlang dlls/mlang/__install__ dlls/mlang/__install-lib__ dlls/mlang/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mlang/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mlang"
 test "x$enable_mlang" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mlang"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16712,8 +16712,8 @@ mlang_test.exe: \$(TOPOBJDIR)/dlls/mlang/tests/mlang_test.exe$DLLEXT
 mlang_test.rc:
 	echo \"mlang_test.exe TESTRES \\\"mlang_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mlang_test.res: mlang_test.rc mlang_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mlang/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mlang/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mlang/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16723,8 +16723,8 @@ ac_config_files="$ac_config_files dlls/mlang/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmdevapi dlls/mmdevapi/__install__ dlls/mmdevapi/__install-lib__ dlls/mmdevapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mmdevapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mmdevapi"
 test "x$enable_mmdevapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mmdevapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16743,8 +16743,8 @@ mmdevapi_test.exe: \$(TOPOBJDIR)/dlls/mmdevapi/tests/mmdevapi_test.exe$DLLEXT
 mmdevapi_test.rc:
 	echo \"mmdevapi_test.exe TESTRES \\\"mmdevapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mmdevapi_test.res: mmdevapi_test.rc mmdevapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mmdevapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mmdevapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mmdevapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16754,8 +16754,8 @@ ac_config_files="$ac_config_files dlls/mmdevapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmdevldr.vxd dlls/mmdevldr.vxd/__install__ dlls/mmdevldr.vxd/__install-lib__ dlls/mmdevldr.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mmdevldr.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mmdevldr.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mmdevldr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16765,8 +16765,8 @@ ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmsystem.dll16 dlls/mmsystem.dll16/__install__ dlls/mmsystem.dll16/__install-lib__ dlls/mmsystem.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mmsystem.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mmsystem.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mmsystem.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16776,8 +16776,8 @@ ac_config_files="$ac_config_files dlls/mmsystem.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/monodebg.vxd dlls/monodebg.vxd/__install__ dlls/monodebg.vxd/__install-lib__ dlls/monodebg.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/monodebg.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/monodebg.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/monodebg.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16787,8 +16787,8 @@ ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mountmgr.sys dlls/mountmgr.sys/__install__ dlls/mountmgr.sys/__install-lib__ dlls/mountmgr.sys/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mountmgr.sys/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mountmgr.sys"
 test "x$enable_mountmgr_sys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mountmgr.sys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16798,8 +16798,8 @@ ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mouse.drv16 dlls/mouse.drv16/__install__ dlls/mouse.drv16/__install-lib__ dlls/mouse.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mouse.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mouse.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mouse.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16814,8 +16814,8 @@ dlls/mpr/libmpr.$IMPLIBEXT dlls/mpr/libmpr.cross.a: tools/widl tools/winebuild t
 dlls/mpr/libmpr.$IMPLIBEXT dlls/mpr/libmpr.cross.a: dlls/mpr/mpr.spec dlls/mpr/Makefile
 	@cd dlls/mpr && \$(MAKE) \`basename \$@\`
 dlls/mpr dlls/mpr/__install__ dlls/mpr/__install-lib__ dlls/mpr/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mpr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mpr"
 test "x$enable_mpr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mpr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16830,8 +16830,8 @@ dlls/mprapi/libmprapi.$IMPLIBEXT dlls/mprapi/libmprapi.cross.a: tools/widl tools
 dlls/mprapi/libmprapi.$IMPLIBEXT dlls/mprapi/libmprapi.cross.a: dlls/mprapi/mprapi.spec dlls/mprapi/Makefile
 	@cd dlls/mprapi && \$(MAKE) \`basename \$@\`
 dlls/mprapi dlls/mprapi/__install__ dlls/mprapi/__install-lib__ dlls/mprapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mprapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mprapi"
 test "x$enable_mprapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mprapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16841,8 +16841,8 @@ ac_config_files="$ac_config_files dlls/mprapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm.dll16 dlls/msacm.dll16/__install__ dlls/msacm.dll16/__install-lib__ dlls/msacm.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msacm.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msacm.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msacm.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16852,8 +16852,8 @@ ac_config_files="$ac_config_files dlls/msacm.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32.drv dlls/msacm32.drv/__install__ dlls/msacm32.drv/__install-lib__ dlls/msacm32.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msacm32.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msacm32.drv"
 test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msacm32.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16868,8 +16868,8 @@ dlls/msacm32/libmsacm32.$IMPLIBEXT dlls/msacm32/libmsacm32.cross.a: tools/widl t
 dlls/msacm32/libmsacm32.$IMPLIBEXT dlls/msacm32/libmsacm32.cross.a: dlls/msacm32/msacm32.spec dlls/msacm32/Makefile
 	@cd dlls/msacm32 && \$(MAKE) \`basename \$@\`
 dlls/msacm32 dlls/msacm32/__install__ dlls/msacm32/__install-lib__ dlls/msacm32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msacm32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msacm32"
 test "x$enable_msacm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msacm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16888,8 +16888,8 @@ msacm32_test.exe: \$(TOPOBJDIR)/dlls/msacm32/tests/msacm32_test.exe$DLLEXT
 msacm32_test.rc:
 	echo \"msacm32_test.exe TESTRES \\\"msacm32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msacm32_test.res: msacm32_test.rc msacm32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msacm32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msacm32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msacm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16899,8 +16899,8 @@ ac_config_files="$ac_config_files dlls/msacm32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msadp32.acm dlls/msadp32.acm/__install__ dlls/msadp32.acm/__install-lib__ dlls/msadp32.acm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msadp32.acm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msadp32.acm"
 test "x$enable_msadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16910,8 +16910,8 @@ ac_config_files="$ac_config_files dlls/msadp32.acm/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscat32 dlls/mscat32/__install__ dlls/mscat32/__install-lib__ dlls/mscat32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mscat32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mscat32"
 test "x$enable_mscat32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mscat32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16926,8 +16926,8 @@ dlls/mscms/libmscms.$IMPLIBEXT dlls/mscms/libmscms.cross.a: tools/widl tools/win
 dlls/mscms/libmscms.$IMPLIBEXT dlls/mscms/libmscms.cross.a: dlls/mscms/mscms.spec dlls/mscms/Makefile
 	@cd dlls/mscms && \$(MAKE) \`basename \$@\`
 dlls/mscms dlls/mscms/__install__ dlls/mscms/__install-lib__ dlls/mscms/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mscms/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mscms"
 test "x$enable_mscms" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mscms"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16946,8 +16946,8 @@ mscms_test.exe: \$(TOPOBJDIR)/dlls/mscms/tests/mscms_test.exe$DLLEXT
 mscms_test.rc:
 	echo \"mscms_test.exe TESTRES \\\"mscms_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mscms_test.res: mscms_test.rc mscms_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mscms/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mscms/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mscms/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16957,8 +16957,8 @@ ac_config_files="$ac_config_files dlls/mscms/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscoree dlls/mscoree/__install__ dlls/mscoree/__install-lib__ dlls/mscoree/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mscoree/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mscoree"
 test "x$enable_mscoree" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mscoree"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16968,8 +16968,8 @@ ac_config_files="$ac_config_files dlls/mscoree/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msctf dlls/msctf/__install__ dlls/msctf/__install-lib__ dlls/msctf/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msctf/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msctf"
 test "x$enable_msctf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msctf"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16988,8 +16988,8 @@ msctf_test.exe: \$(TOPOBJDIR)/dlls/msctf/tests/msctf_test.exe$DLLEXT
 msctf_test.rc:
 	echo \"msctf_test.exe TESTRES \\\"msctf_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msctf_test.res: msctf_test.rc msctf_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msctf/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msctf/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msctf/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -16999,8 +16999,8 @@ ac_config_files="$ac_config_files dlls/msctf/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msdaps dlls/msdaps/__install__ dlls/msdaps/__install-lib__ dlls/msdaps/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msdaps/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msdaps"
 test "x$enable_msdaps" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msdaps"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17015,8 +17015,8 @@ dlls/msdmo/libmsdmo.$IMPLIBEXT dlls/msdmo/libmsdmo.cross.a: tools/widl tools/win
 dlls/msdmo/libmsdmo.$IMPLIBEXT dlls/msdmo/libmsdmo.cross.a: dlls/msdmo/msdmo.spec dlls/msdmo/Makefile
 	@cd dlls/msdmo && \$(MAKE) \`basename \$@\`
 dlls/msdmo dlls/msdmo/__install__ dlls/msdmo/__install-lib__ dlls/msdmo/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msdmo/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msdmo"
 test "x$enable_msdmo" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msdmo"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17026,8 +17026,8 @@ ac_config_files="$ac_config_files dlls/msdmo/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msftedit dlls/msftedit/__install__ dlls/msftedit/__install-lib__ dlls/msftedit/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msftedit/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msftedit"
 test "x$enable_msftedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msftedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17037,8 +17037,8 @@ ac_config_files="$ac_config_files dlls/msftedit/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msg711.acm dlls/msg711.acm/__install__ dlls/msg711.acm/__install-lib__ dlls/msg711.acm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msg711.acm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msg711.acm"
 test "x$enable_msg711_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msg711.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17048,8 +17048,8 @@ ac_config_files="$ac_config_files dlls/msg711.acm/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msgsm32.acm dlls/msgsm32.acm/__install__ dlls/msgsm32.acm/__install-lib__ dlls/msgsm32.acm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msgsm32.acm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msgsm32.acm"
 test "x$enable_msgsm32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msgsm32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17059,8 +17059,8 @@ ac_config_files="$ac_config_files dlls/msgsm32.acm/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml.tlb dlls/mshtml.tlb/__install__ dlls/mshtml.tlb/__install-lib__ dlls/mshtml.tlb/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mshtml.tlb/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mshtml.tlb"
 test "x$enable_mshtml_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mshtml.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17075,8 +17075,8 @@ dlls/mshtml/libmshtml.$IMPLIBEXT dlls/mshtml/libmshtml.cross.a: tools/widl tools
 dlls/mshtml/libmshtml.$IMPLIBEXT dlls/mshtml/libmshtml.cross.a: dlls/mshtml/mshtml.spec dlls/mshtml/Makefile
 	@cd dlls/mshtml && \$(MAKE) \`basename \$@\`
 dlls/mshtml dlls/mshtml/__install__ dlls/mshtml/__install-lib__ dlls/mshtml/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mshtml/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mshtml"
 test "x$enable_mshtml" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mshtml"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17095,8 +17095,8 @@ mshtml_test.exe: \$(TOPOBJDIR)/dlls/mshtml/tests/mshtml_test.exe$DLLEXT
 mshtml_test.rc:
 	echo \"mshtml_test.exe TESTRES \\\"mshtml_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mshtml_test.res: mshtml_test.rc mshtml_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mshtml/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mshtml/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mshtml/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17111,8 +17111,8 @@ dlls/msi/libmsi.$IMPLIBEXT dlls/msi/libmsi.cross.a: tools/widl tools/winebuild t
 dlls/msi/libmsi.$IMPLIBEXT dlls/msi/libmsi.cross.a: dlls/msi/msi.spec dlls/msi/Makefile
 	@cd dlls/msi && \$(MAKE) \`basename \$@\`
 dlls/msi dlls/msi/__install__ dlls/msi/__install-lib__ dlls/msi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msi"
 test "x$enable_msi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17131,8 +17131,8 @@ msi_test.exe: \$(TOPOBJDIR)/dlls/msi/tests/msi_test.exe$DLLEXT
 msi_test.rc:
 	echo \"msi_test.exe TESTRES \\\"msi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msi_test.res: msi_test.rc msi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17147,8 +17147,8 @@ dlls/msimg32/libmsimg32.$IMPLIBEXT dlls/msimg32/libmsimg32.cross.a: tools/widl t
 dlls/msimg32/libmsimg32.$IMPLIBEXT dlls/msimg32/libmsimg32.cross.a: dlls/msimg32/msimg32.spec dlls/msimg32/Makefile
 	@cd dlls/msimg32 && \$(MAKE) \`basename \$@\`
 dlls/msimg32 dlls/msimg32/__install__ dlls/msimg32/__install-lib__ dlls/msimg32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msimg32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msimg32"
 test "x$enable_msimg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msimg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17158,8 +17158,8 @@ ac_config_files="$ac_config_files dlls/msimg32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msimtf dlls/msimtf/__install__ dlls/msimtf/__install-lib__ dlls/msimtf/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msimtf/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msimtf"
 test "x$enable_msimtf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msimtf"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17169,8 +17169,8 @@ ac_config_files="$ac_config_files dlls/msimtf/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisip dlls/msisip/__install__ dlls/msisip/__install-lib__ dlls/msisip/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msisip/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msisip"
 test "x$enable_msisip" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msisip"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17180,8 +17180,8 @@ ac_config_files="$ac_config_files dlls/msisip/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisys.ocx dlls/msisys.ocx/__install__ dlls/msisys.ocx/__install-lib__ dlls/msisys.ocx/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msisys.ocx/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msisys.ocx"
 test "x$enable_msisys_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msisys.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17191,8 +17191,8 @@ ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msnet32 dlls/msnet32/__install__ dlls/msnet32/__install-lib__ dlls/msnet32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msnet32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msnet32"
 test "x$enable_msnet32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msnet32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17202,8 +17202,8 @@ ac_config_files="$ac_config_files dlls/msnet32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msrle32 dlls/msrle32/__install__ dlls/msrle32/__install-lib__ dlls/msrle32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msrle32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msrle32"
 test "x$enable_msrle32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msrle32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17213,8 +17213,8 @@ ac_config_files="$ac_config_files dlls/msrle32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mssign32 dlls/mssign32/__install__ dlls/mssign32/__install-lib__ dlls/mssign32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mssign32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mssign32"
 test "x$enable_mssign32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mssign32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17224,8 +17224,8 @@ ac_config_files="$ac_config_files dlls/mssign32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mssip32 dlls/mssip32/__install__ dlls/mssip32/__install-lib__ dlls/mssip32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mssip32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mssip32"
 test "x$enable_mssip32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mssip32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17235,8 +17235,8 @@ ac_config_files="$ac_config_files dlls/mssip32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mstask dlls/mstask/__install__ dlls/mstask/__install-lib__ dlls/mstask/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mstask/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mstask"
 test "x$enable_mstask" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mstask"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17255,8 +17255,8 @@ mstask_test.exe: \$(TOPOBJDIR)/dlls/mstask/tests/mstask_test.exe$DLLEXT
 mstask_test.rc:
 	echo \"mstask_test.exe TESTRES \\\"mstask_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 mstask_test.res: mstask_test.rc mstask_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mstask/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mstask/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/mstask/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17266,8 +17266,8 @@ ac_config_files="$ac_config_files dlls/mstask/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcirt dlls/msvcirt/__install__ dlls/msvcirt/__install-lib__ dlls/msvcirt/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcirt/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcirt"
 test "x$enable_msvcirt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcirt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17282,8 +17282,8 @@ dlls/msvcr71/libmsvcr71.$IMPLIBEXT dlls/msvcr71/libmsvcr71.cross.a: tools/widl t
 dlls/msvcr71/libmsvcr71.$IMPLIBEXT dlls/msvcr71/libmsvcr71.cross.a: dlls/msvcr71/msvcr71.spec dlls/msvcr71/Makefile
 	@cd dlls/msvcr71 && \$(MAKE) \`basename \$@\`
 dlls/msvcr71 dlls/msvcr71/__install__ dlls/msvcr71/__install-lib__ dlls/msvcr71/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcr71/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcr71"
 test "x$enable_msvcr71" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcr71"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17298,8 +17298,8 @@ dlls/msvcrt/libmsvcrt.$IMPLIBEXT dlls/msvcrt/libmsvcrt.cross.a: tools/widl tools
 dlls/msvcrt/libmsvcrt.$IMPLIBEXT dlls/msvcrt/libmsvcrt.cross.a: dlls/msvcrt/msvcrt.spec dlls/msvcrt/Makefile
 	@cd dlls/msvcrt && \$(MAKE) \`basename \$@\`
 dlls/msvcrt dlls/msvcrt/__install__ dlls/msvcrt/__install-lib__ dlls/msvcrt/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrt/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrt"
 test "x$enable_msvcrt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcrt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17318,8 +17318,8 @@ msvcrt_test.exe: \$(TOPOBJDIR)/dlls/msvcrt/tests/msvcrt_test.exe$DLLEXT
 msvcrt_test.rc:
 	echo \"msvcrt_test.exe TESTRES \\\"msvcrt_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msvcrt_test.res: msvcrt_test.rc msvcrt_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrt/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrt/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msvcrt/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17334,8 +17334,8 @@ dlls/msvcrt20/libmsvcrt20.$IMPLIBEXT dlls/msvcrt20/libmsvcrt20.cross.a: tools/wi
 dlls/msvcrt20/libmsvcrt20.$IMPLIBEXT dlls/msvcrt20/libmsvcrt20.cross.a: dlls/msvcrt20/msvcrt20.spec dlls/msvcrt20/Makefile
 	@cd dlls/msvcrt20 && \$(MAKE) \`basename \$@\`
 dlls/msvcrt20 dlls/msvcrt20/__install__ dlls/msvcrt20/__install-lib__ dlls/msvcrt20/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrt20/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrt20"
 test "x$enable_msvcrt20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcrt20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17350,8 +17350,8 @@ dlls/msvcrt40/libmsvcrt40.$IMPLIBEXT dlls/msvcrt40/libmsvcrt40.cross.a: tools/wi
 dlls/msvcrt40/libmsvcrt40.$IMPLIBEXT dlls/msvcrt40/libmsvcrt40.cross.a: dlls/msvcrt40/msvcrt40.spec dlls/msvcrt40/Makefile
 	@cd dlls/msvcrt40 && \$(MAKE) \`basename \$@\`
 dlls/msvcrt40 dlls/msvcrt40/__install__ dlls/msvcrt40/__install-lib__ dlls/msvcrt40/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrt40/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrt40"
 test "x$enable_msvcrt40" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcrt40"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17366,8 +17366,8 @@ dlls/msvcrtd/libmsvcrtd.$IMPLIBEXT dlls/msvcrtd/libmsvcrtd.cross.a: tools/widl t
 dlls/msvcrtd/libmsvcrtd.$IMPLIBEXT dlls/msvcrtd/libmsvcrtd.cross.a: dlls/msvcrtd/msvcrtd.spec dlls/msvcrtd/Makefile
 	@cd dlls/msvcrtd && \$(MAKE) \`basename \$@\`
 dlls/msvcrtd dlls/msvcrtd/__install__ dlls/msvcrtd/__install-lib__ dlls/msvcrtd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrtd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrtd"
 test "x$enable_msvcrtd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvcrtd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17386,8 +17386,8 @@ msvcrtd_test.exe: \$(TOPOBJDIR)/dlls/msvcrtd/tests/msvcrtd_test.exe$DLLEXT
 msvcrtd_test.rc:
 	echo \"msvcrtd_test.exe TESTRES \\\"msvcrtd_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msvcrtd_test.res: msvcrtd_test.rc msvcrtd_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvcrtd/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvcrtd/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msvcrtd/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17402,8 +17402,8 @@ dlls/msvfw32/libmsvfw32.$IMPLIBEXT dlls/msvfw32/libmsvfw32.cross.a: tools/widl t
 dlls/msvfw32/libmsvfw32.$IMPLIBEXT dlls/msvfw32/libmsvfw32.cross.a: dlls/msvfw32/msvfw32.spec dlls/msvfw32/Makefile
 	@cd dlls/msvfw32 && \$(MAKE) \`basename \$@\`
 dlls/msvfw32 dlls/msvfw32/__install__ dlls/msvfw32/__install-lib__ dlls/msvfw32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvfw32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvfw32"
 test "x$enable_msvfw32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvfw32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17422,8 +17422,8 @@ msvfw32_test.exe: \$(TOPOBJDIR)/dlls/msvfw32/tests/msvfw32_test.exe$DLLEXT
 msvfw32_test.rc:
 	echo \"msvfw32_test.exe TESTRES \\\"msvfw32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msvfw32_test.res: msvfw32_test.rc msvfw32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvfw32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvfw32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msvfw32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17433,8 +17433,8 @@ ac_config_files="$ac_config_files dlls/msvfw32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvidc32 dlls/msvidc32/__install__ dlls/msvidc32/__install-lib__ dlls/msvidc32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvidc32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvidc32"
 test "x$enable_msvidc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvidc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17444,8 +17444,8 @@ ac_config_files="$ac_config_files dlls/msvidc32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvideo.dll16 dlls/msvideo.dll16/__install__ dlls/msvideo.dll16/__install-lib__ dlls/msvideo.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msvideo.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msvideo.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msvideo.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17460,8 +17460,8 @@ dlls/mswsock/libmswsock.$IMPLIBEXT dlls/mswsock/libmswsock.cross.a: tools/widl t
 dlls/mswsock/libmswsock.$IMPLIBEXT dlls/mswsock/libmswsock.cross.a: dlls/mswsock/mswsock.spec dlls/mswsock/Makefile
 	@cd dlls/mswsock && \$(MAKE) \`basename \$@\`
 dlls/mswsock dlls/mswsock/__install__ dlls/mswsock/__install-lib__ dlls/mswsock/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/mswsock/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/mswsock"
 test "x$enable_mswsock" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/mswsock"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17471,8 +17471,8 @@ ac_config_files="$ac_config_files dlls/mswsock/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml3 dlls/msxml3/__install__ dlls/msxml3/__install-lib__ dlls/msxml3/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msxml3/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msxml3"
 test "x$enable_msxml3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msxml3"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17491,8 +17491,8 @@ msxml3_test.exe: \$(TOPOBJDIR)/dlls/msxml3/tests/msxml3_test.exe$DLLEXT
 msxml3_test.rc:
 	echo \"msxml3_test.exe TESTRES \\\"msxml3_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 msxml3_test.res: msxml3_test.rc msxml3_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msxml3/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msxml3/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/msxml3/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17502,8 +17502,8 @@ ac_config_files="$ac_config_files dlls/msxml3/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml4 dlls/msxml4/__install__ dlls/msxml4/__install-lib__ dlls/msxml4/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/msxml4/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/msxml4"
 test "x$enable_msxml4" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/msxml4"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17518,8 +17518,8 @@ dlls/nddeapi/libnddeapi.$IMPLIBEXT dlls/nddeapi/libnddeapi.cross.a: tools/widl t
 dlls/nddeapi/libnddeapi.$IMPLIBEXT dlls/nddeapi/libnddeapi.cross.a: dlls/nddeapi/nddeapi.spec dlls/nddeapi/Makefile
 	@cd dlls/nddeapi && \$(MAKE) \`basename \$@\`
 dlls/nddeapi dlls/nddeapi/__install__ dlls/nddeapi/__install-lib__ dlls/nddeapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/nddeapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/nddeapi"
 test "x$enable_nddeapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/nddeapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17534,8 +17534,8 @@ dlls/netapi32/libnetapi32.$IMPLIBEXT dlls/netapi32/libnetapi32.cross.a: tools/wi
 dlls/netapi32/libnetapi32.$IMPLIBEXT dlls/netapi32/libnetapi32.cross.a: dlls/netapi32/netapi32.spec dlls/netapi32/Makefile
 	@cd dlls/netapi32 && \$(MAKE) \`basename \$@\`
 dlls/netapi32 dlls/netapi32/__install__ dlls/netapi32/__install-lib__ dlls/netapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/netapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/netapi32"
 test "x$enable_netapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/netapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17554,8 +17554,8 @@ netapi32_test.exe: \$(TOPOBJDIR)/dlls/netapi32/tests/netapi32_test.exe$DLLEXT
 netapi32_test.rc:
 	echo \"netapi32_test.exe TESTRES \\\"netapi32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 netapi32_test.res: netapi32_test.rc netapi32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/netapi32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/netapi32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/netapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17570,8 +17570,8 @@ dlls/newdev/libnewdev.$IMPLIBEXT dlls/newdev/libnewdev.cross.a: tools/widl tools
 dlls/newdev/libnewdev.$IMPLIBEXT dlls/newdev/libnewdev.cross.a: dlls/newdev/newdev.spec dlls/newdev/Makefile
 	@cd dlls/newdev && \$(MAKE) \`basename \$@\`
 dlls/newdev dlls/newdev/__install__ dlls/newdev/__install-lib__ dlls/newdev/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/newdev/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/newdev"
 test "x$enable_newdev" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/newdev"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17586,8 +17586,8 @@ dlls/ntdll/libntdll.$IMPLIBEXT dlls/ntdll/libntdll.cross.a: tools/widl tools/win
 dlls/ntdll/libntdll.$IMPLIBEXT dlls/ntdll/libntdll.cross.a: dlls/ntdll/ntdll.spec dlls/ntdll/Makefile
 	@cd dlls/ntdll && \$(MAKE) \`basename \$@\`
 dlls/ntdll dlls/ntdll/__install__ dlls/ntdll/__install-lib__ dlls/ntdll/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntdll/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntdll"
 test "x$enable_ntdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ntdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17606,8 +17606,8 @@ ntdll_test.exe: \$(TOPOBJDIR)/dlls/ntdll/tests/ntdll_test.exe$DLLEXT
 ntdll_test.rc:
 	echo \"ntdll_test.exe TESTRES \\\"ntdll_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ntdll_test.res: ntdll_test.rc ntdll_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntdll/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntdll/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ntdll/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17622,8 +17622,8 @@ dlls/ntdsapi/libntdsapi.$IMPLIBEXT dlls/ntdsapi/libntdsapi.cross.a: tools/widl t
 dlls/ntdsapi/libntdsapi.$IMPLIBEXT dlls/ntdsapi/libntdsapi.cross.a: dlls/ntdsapi/ntdsapi.spec dlls/ntdsapi/Makefile
 	@cd dlls/ntdsapi && \$(MAKE) \`basename \$@\`
 dlls/ntdsapi dlls/ntdsapi/__install__ dlls/ntdsapi/__install-lib__ dlls/ntdsapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntdsapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntdsapi"
 test "x$enable_ntdsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ntdsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17642,8 +17642,8 @@ ntdsapi_test.exe: \$(TOPOBJDIR)/dlls/ntdsapi/tests/ntdsapi_test.exe$DLLEXT
 ntdsapi_test.rc:
 	echo \"ntdsapi_test.exe TESTRES \\\"ntdsapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ntdsapi_test.res: ntdsapi_test.rc ntdsapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntdsapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntdsapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ntdsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17658,8 +17658,8 @@ dlls/ntoskrnl.exe/libntoskrnl.exe.$IMPLIBEXT dlls/ntoskrnl.exe/libntoskrnl.exe.c
 dlls/ntoskrnl.exe/libntoskrnl.exe.$IMPLIBEXT dlls/ntoskrnl.exe/libntoskrnl.exe.cross.a: dlls/ntoskrnl.exe/ntoskrnl.exe.spec dlls/ntoskrnl.exe/Makefile
 	@cd dlls/ntoskrnl.exe && \$(MAKE) \`basename \$@\`
 dlls/ntoskrnl.exe dlls/ntoskrnl.exe/__install__ dlls/ntoskrnl.exe/__install-lib__ dlls/ntoskrnl.exe/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntoskrnl.exe/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntoskrnl.exe"
 test "x$enable_ntoskrnl_exe" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ntoskrnl.exe"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17669,8 +17669,8 @@ ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntprint dlls/ntprint/__install__ dlls/ntprint/__install-lib__ dlls/ntprint/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntprint/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntprint"
 test "x$enable_ntprint" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ntprint"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17689,8 +17689,8 @@ ntprint_test.exe: \$(TOPOBJDIR)/dlls/ntprint/tests/ntprint_test.exe$DLLEXT
 ntprint_test.rc:
 	echo \"ntprint_test.exe TESTRES \\\"ntprint_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ntprint_test.res: ntprint_test.rc ntprint_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ntprint/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ntprint/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ntprint/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17700,8 +17700,8 @@ ac_config_files="$ac_config_files dlls/ntprint/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/objsel dlls/objsel/__install__ dlls/objsel/__install-lib__ dlls/objsel/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/objsel/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/objsel"
 test "x$enable_objsel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/objsel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17716,8 +17716,8 @@ dlls/odbc32/libodbc32.$IMPLIBEXT dlls/odbc32/libodbc32.cross.a: tools/widl tools
 dlls/odbc32/libodbc32.$IMPLIBEXT dlls/odbc32/libodbc32.cross.a: dlls/odbc32/odbc32.spec dlls/odbc32/Makefile
 	@cd dlls/odbc32 && \$(MAKE) \`basename \$@\`
 dlls/odbc32 dlls/odbc32/__install__ dlls/odbc32/__install-lib__ dlls/odbc32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/odbc32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/odbc32"
 test "x$enable_odbc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/odbc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17732,8 +17732,8 @@ dlls/odbccp32/libodbccp32.$IMPLIBEXT dlls/odbccp32/libodbccp32.cross.a: tools/wi
 dlls/odbccp32/libodbccp32.$IMPLIBEXT dlls/odbccp32/libodbccp32.cross.a: dlls/odbccp32/odbccp32.spec dlls/odbccp32/Makefile
 	@cd dlls/odbccp32 && \$(MAKE) \`basename \$@\`
 dlls/odbccp32 dlls/odbccp32/__install__ dlls/odbccp32/__install-lib__ dlls/odbccp32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/odbccp32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/odbccp32"
 test "x$enable_odbccp32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/odbccp32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17752,8 +17752,8 @@ odbccp32_test.exe: \$(TOPOBJDIR)/dlls/odbccp32/tests/odbccp32_test.exe$DLLEXT
 odbccp32_test.rc:
 	echo \"odbccp32_test.exe TESTRES \\\"odbccp32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 odbccp32_test.res: odbccp32_test.rc odbccp32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/odbccp32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/odbccp32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/odbccp32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17763,8 +17763,8 @@ ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2.dll16 dlls/ole2.dll16/__install__ dlls/ole2.dll16/__install-lib__ dlls/ole2.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17774,8 +17774,8 @@ ac_config_files="$ac_config_files dlls/ole2.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2conv.dll16 dlls/ole2conv.dll16/__install__ dlls/ole2conv.dll16/__install-lib__ dlls/ole2conv.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2conv.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2conv.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2conv.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17785,8 +17785,8 @@ ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2disp.dll16 dlls/ole2disp.dll16/__install__ dlls/ole2disp.dll16/__install-lib__ dlls/ole2disp.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2disp.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2disp.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2disp.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17796,8 +17796,8 @@ ac_config_files="$ac_config_files dlls/ole2disp.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2nls.dll16 dlls/ole2nls.dll16/__install__ dlls/ole2nls.dll16/__install-lib__ dlls/ole2nls.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2nls.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2nls.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2nls.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17807,8 +17807,8 @@ ac_config_files="$ac_config_files dlls/ole2nls.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2prox.dll16 dlls/ole2prox.dll16/__install__ dlls/ole2prox.dll16/__install-lib__ dlls/ole2prox.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2prox.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2prox.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2prox.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17818,8 +17818,8 @@ ac_config_files="$ac_config_files dlls/ole2prox.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2thk.dll16 dlls/ole2thk.dll16/__install__ dlls/ole2thk.dll16/__install-lib__ dlls/ole2thk.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole2thk.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole2thk.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole2thk.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17834,8 +17834,8 @@ dlls/ole32/libole32.$IMPLIBEXT dlls/ole32/libole32.cross.a: tools/widl tools/win
 dlls/ole32/libole32.$IMPLIBEXT dlls/ole32/libole32.cross.a: dlls/ole32/ole32.spec dlls/ole32/Makefile
 	@cd dlls/ole32 && \$(MAKE) \`basename \$@\`
 dlls/ole32 dlls/ole32/__install__ dlls/ole32/__install-lib__ dlls/ole32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole32"
 test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ole32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17854,8 +17854,8 @@ ole32_test.exe: \$(TOPOBJDIR)/dlls/ole32/tests/ole32_test.exe$DLLEXT
 ole32_test.rc:
 	echo \"ole32_test.exe TESTRES \\\"ole32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ole32_test.res: ole32_test.rc ole32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ole32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ole32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ole32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17870,8 +17870,8 @@ dlls/oleacc/liboleacc.$IMPLIBEXT dlls/oleacc/liboleacc.cross.a: tools/widl tools
 dlls/oleacc/liboleacc.$IMPLIBEXT dlls/oleacc/liboleacc.cross.a: dlls/oleacc/oleacc.spec dlls/oleacc/Makefile
 	@cd dlls/oleacc && \$(MAKE) \`basename \$@\`
 dlls/oleacc dlls/oleacc/__install__ dlls/oleacc/__install-lib__ dlls/oleacc/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oleacc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oleacc"
 test "x$enable_oleacc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/oleacc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17890,8 +17890,8 @@ oleacc_test.exe: \$(TOPOBJDIR)/dlls/oleacc/tests/oleacc_test.exe$DLLEXT
 oleacc_test.rc:
 	echo \"oleacc_test.exe TESTRES \\\"oleacc_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 oleacc_test.res: oleacc_test.rc oleacc_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oleacc/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oleacc/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/oleacc/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17906,8 +17906,8 @@ dlls/oleaut32/liboleaut32.$IMPLIBEXT dlls/oleaut32/liboleaut32.cross.a: tools/wi
 dlls/oleaut32/liboleaut32.$IMPLIBEXT dlls/oleaut32/liboleaut32.cross.a: dlls/oleaut32/oleaut32.spec dlls/oleaut32/Makefile
 	@cd dlls/oleaut32 && \$(MAKE) \`basename \$@\`
 dlls/oleaut32 dlls/oleaut32/__install__ dlls/oleaut32/__install-lib__ dlls/oleaut32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oleaut32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oleaut32"
 test "x$enable_oleaut32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/oleaut32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17926,8 +17926,8 @@ oleaut32_test.exe: \$(TOPOBJDIR)/dlls/oleaut32/tests/oleaut32_test.exe$DLLEXT
 oleaut32_test.rc:
 	echo \"oleaut32_test.exe TESTRES \\\"oleaut32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 oleaut32_test.res: oleaut32_test.rc oleaut32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oleaut32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oleaut32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/oleaut32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17937,8 +17937,8 @@ ac_config_files="$ac_config_files dlls/oleaut32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olecli.dll16 dlls/olecli.dll16/__install__ dlls/olecli.dll16/__install-lib__ dlls/olecli.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olecli.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olecli.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olecli.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17953,8 +17953,8 @@ dlls/olecli32/libolecli32.$IMPLIBEXT dlls/olecli32/libolecli32.cross.a: tools/wi
 dlls/olecli32/libolecli32.$IMPLIBEXT dlls/olecli32/libolecli32.cross.a: dlls/olecli32/olecli32.spec dlls/olecli32/Makefile
 	@cd dlls/olecli32 && \$(MAKE) \`basename \$@\`
 dlls/olecli32 dlls/olecli32/__install__ dlls/olecli32/__install-lib__ dlls/olecli32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olecli32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olecli32"
 test "x$enable_olecli32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olecli32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17964,8 +17964,8 @@ ac_config_files="$ac_config_files dlls/olecli32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oledb32 dlls/oledb32/__install__ dlls/oledb32/__install-lib__ dlls/oledb32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oledb32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oledb32"
 test "x$enable_oledb32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/oledb32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -17984,8 +17984,8 @@ oledb32_test.exe: \$(TOPOBJDIR)/dlls/oledb32/tests/oledb32_test.exe$DLLEXT
 oledb32_test.rc:
 	echo \"oledb32_test.exe TESTRES \\\"oledb32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 oledb32_test.res: oledb32_test.rc oledb32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oledb32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oledb32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/oledb32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18000,8 +18000,8 @@ dlls/oledlg/liboledlg.$IMPLIBEXT dlls/oledlg/liboledlg.cross.a: tools/widl tools
 dlls/oledlg/liboledlg.$IMPLIBEXT dlls/oledlg/liboledlg.cross.a: dlls/oledlg/oledlg.spec dlls/oledlg/Makefile
 	@cd dlls/oledlg && \$(MAKE) \`basename \$@\`
 dlls/oledlg dlls/oledlg/__install__ dlls/oledlg/__install-lib__ dlls/oledlg/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/oledlg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/oledlg"
 test "x$enable_oledlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/oledlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18016,8 +18016,8 @@ dlls/olepro32/libolepro32.$IMPLIBEXT dlls/olepro32/libolepro32.cross.a: tools/wi
 dlls/olepro32/libolepro32.$IMPLIBEXT dlls/olepro32/libolepro32.cross.a: dlls/olepro32/olepro32.spec dlls/olepro32/Makefile
 	@cd dlls/olepro32 && \$(MAKE) \`basename \$@\`
 dlls/olepro32 dlls/olepro32/__install__ dlls/olepro32/__install-lib__ dlls/olepro32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olepro32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olepro32"
 test "x$enable_olepro32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olepro32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18027,8 +18027,8 @@ ac_config_files="$ac_config_files dlls/olepro32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olesvr.dll16 dlls/olesvr.dll16/__install__ dlls/olesvr.dll16/__install-lib__ dlls/olesvr.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olesvr.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olesvr.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olesvr.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18043,8 +18043,8 @@ dlls/olesvr32/libolesvr32.$IMPLIBEXT dlls/olesvr32/libolesvr32.cross.a: tools/wi
 dlls/olesvr32/libolesvr32.$IMPLIBEXT dlls/olesvr32/libolesvr32.cross.a: dlls/olesvr32/olesvr32.spec dlls/olesvr32/Makefile
 	@cd dlls/olesvr32 && \$(MAKE) \`basename \$@\`
 dlls/olesvr32 dlls/olesvr32/__install__ dlls/olesvr32/__install-lib__ dlls/olesvr32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olesvr32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olesvr32"
 test "x$enable_olesvr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olesvr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18054,8 +18054,8 @@ ac_config_files="$ac_config_files dlls/olesvr32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olethk32 dlls/olethk32/__install__ dlls/olethk32/__install-lib__ dlls/olethk32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/olethk32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/olethk32"
 test "x$enable_olethk32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/olethk32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18065,8 +18065,8 @@ ac_config_files="$ac_config_files dlls/olethk32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/openal32 dlls/openal32/__install__ dlls/openal32/__install-lib__ dlls/openal32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/openal32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/openal32"
 test "x$enable_openal32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/openal32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18081,8 +18081,8 @@ dlls/opengl32/libopengl32.$IMPLIBEXT dlls/opengl32/libopengl32.cross.a: tools/wi
 dlls/opengl32/libopengl32.$IMPLIBEXT dlls/opengl32/libopengl32.cross.a: dlls/opengl32/opengl32.spec dlls/opengl32/Makefile
 	@cd dlls/opengl32 && \$(MAKE) \`basename \$@\`
 dlls/opengl32 dlls/opengl32/__install__ dlls/opengl32/__install-lib__ dlls/opengl32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/opengl32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/opengl32"
 test "x$enable_opengl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/opengl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18101,8 +18101,8 @@ opengl32_test.exe: \$(TOPOBJDIR)/dlls/opengl32/tests/opengl32_test.exe$DLLEXT
 opengl32_test.rc:
 	echo \"opengl32_test.exe TESTRES \\\"opengl32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 opengl32_test.res: opengl32_test.rc opengl32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/opengl32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/opengl32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/opengl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18117,8 +18117,8 @@ dlls/pdh/libpdh.$IMPLIBEXT dlls/pdh/libpdh.cross.a: tools/widl tools/winebuild t
 dlls/pdh/libpdh.$IMPLIBEXT dlls/pdh/libpdh.cross.a: dlls/pdh/pdh.spec dlls/pdh/Makefile
 	@cd dlls/pdh && \$(MAKE) \`basename \$@\`
 dlls/pdh dlls/pdh/__install__ dlls/pdh/__install-lib__ dlls/pdh/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/pdh/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/pdh"
 test "x$enable_pdh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/pdh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18137,8 +18137,8 @@ pdh_test.exe: \$(TOPOBJDIR)/dlls/pdh/tests/pdh_test.exe$DLLEXT
 pdh_test.rc:
 	echo \"pdh_test.exe TESTRES \\\"pdh_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 pdh_test.res: pdh_test.rc pdh_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/pdh/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/pdh/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/pdh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18148,8 +18148,8 @@ ac_config_files="$ac_config_files dlls/pdh/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pidgen dlls/pidgen/__install__ dlls/pidgen/__install-lib__ dlls/pidgen/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/pidgen/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/pidgen"
 test "x$enable_pidgen" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/pidgen"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18164,8 +18164,8 @@ dlls/powrprof/libpowrprof.$IMPLIBEXT dlls/powrprof/libpowrprof.cross.a: tools/wi
 dlls/powrprof/libpowrprof.$IMPLIBEXT dlls/powrprof/libpowrprof.cross.a: dlls/powrprof/powrprof.spec dlls/powrprof/Makefile
 	@cd dlls/powrprof && \$(MAKE) \`basename \$@\`
 dlls/powrprof dlls/powrprof/__install__ dlls/powrprof/__install-lib__ dlls/powrprof/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/powrprof/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/powrprof"
 test "x$enable_powrprof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/powrprof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18175,8 +18175,8 @@ ac_config_files="$ac_config_files dlls/powrprof/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/printui dlls/printui/__install__ dlls/printui/__install-lib__ dlls/printui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/printui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/printui"
 test "x$enable_printui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/printui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18186,8 +18186,8 @@ ac_config_files="$ac_config_files dlls/printui/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/propsys dlls/propsys/__install__ dlls/propsys/__install-lib__ dlls/propsys/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/propsys/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/propsys"
 test "x$enable_propsys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/propsys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18202,8 +18202,8 @@ dlls/psapi/libpsapi.$IMPLIBEXT dlls/psapi/libpsapi.cross.a: tools/widl tools/win
 dlls/psapi/libpsapi.$IMPLIBEXT dlls/psapi/libpsapi.cross.a: dlls/psapi/psapi.spec dlls/psapi/Makefile
 	@cd dlls/psapi && \$(MAKE) \`basename \$@\`
 dlls/psapi dlls/psapi/__install__ dlls/psapi/__install-lib__ dlls/psapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/psapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/psapi"
 test "x$enable_psapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/psapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18222,8 +18222,8 @@ psapi_test.exe: \$(TOPOBJDIR)/dlls/psapi/tests/psapi_test.exe$DLLEXT
 psapi_test.rc:
 	echo \"psapi_test.exe TESTRES \\\"psapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 psapi_test.res: psapi_test.rc psapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/psapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/psapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/psapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18233,8 +18233,8 @@ ac_config_files="$ac_config_files dlls/psapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pstorec dlls/pstorec/__install__ dlls/pstorec/__install-lib__ dlls/pstorec/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/pstorec/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/pstorec"
 test "x$enable_pstorec" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/pstorec"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18244,8 +18244,8 @@ ac_config_files="$ac_config_files dlls/pstorec/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qcap dlls/qcap/__install__ dlls/qcap/__install-lib__ dlls/qcap/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qcap/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qcap"
 test "x$enable_qcap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/qcap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18255,8 +18255,8 @@ ac_config_files="$ac_config_files dlls/qcap/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qedit dlls/qedit/__install__ dlls/qedit/__install-lib__ dlls/qedit/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qedit/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qedit"
 test "x$enable_qedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/qedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18275,8 +18275,8 @@ qedit_test.exe: \$(TOPOBJDIR)/dlls/qedit/tests/qedit_test.exe$DLLEXT
 qedit_test.rc:
 	echo \"qedit_test.exe TESTRES \\\"qedit_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 qedit_test.res: qedit_test.rc qedit_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qedit/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qedit/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/qedit/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18286,8 +18286,8 @@ ac_config_files="$ac_config_files dlls/qedit/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgr dlls/qmgr/__install__ dlls/qmgr/__install-lib__ dlls/qmgr/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qmgr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qmgr"
 test "x$enable_qmgr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/qmgr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18306,8 +18306,8 @@ qmgr_test.exe: \$(TOPOBJDIR)/dlls/qmgr/tests/qmgr_test.exe$DLLEXT
 qmgr_test.rc:
 	echo \"qmgr_test.exe TESTRES \\\"qmgr_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 qmgr_test.res: qmgr_test.rc qmgr_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qmgr/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qmgr/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/qmgr/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18317,8 +18317,8 @@ ac_config_files="$ac_config_files dlls/qmgr/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgrprxy dlls/qmgrprxy/__install__ dlls/qmgrprxy/__install-lib__ dlls/qmgrprxy/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/qmgrprxy/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/qmgrprxy"
 test "x$enable_qmgrprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/qmgrprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18333,8 +18333,8 @@ dlls/quartz/libquartz.$IMPLIBEXT dlls/quartz/libquartz.cross.a: tools/widl tools
 dlls/quartz/libquartz.$IMPLIBEXT dlls/quartz/libquartz.cross.a: dlls/quartz/quartz.spec dlls/quartz/Makefile
 	@cd dlls/quartz && \$(MAKE) \`basename \$@\`
 dlls/quartz dlls/quartz/__install__ dlls/quartz/__install-lib__ dlls/quartz/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/quartz/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/quartz"
 test "x$enable_quartz" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/quartz"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18353,8 +18353,8 @@ quartz_test.exe: \$(TOPOBJDIR)/dlls/quartz/tests/quartz_test.exe$DLLEXT
 quartz_test.rc:
 	echo \"quartz_test.exe TESTRES \\\"quartz_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 quartz_test.res: quartz_test.rc quartz_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/quartz/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/quartz/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/quartz/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18364,8 +18364,8 @@ ac_config_files="$ac_config_files dlls/quartz/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/query dlls/query/__install__ dlls/query/__install-lib__ dlls/query/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/query/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/query"
 test "x$enable_query" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/query"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18375,8 +18375,8 @@ ac_config_files="$ac_config_files dlls/query/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rasapi16.dll16 dlls/rasapi16.dll16/__install__ dlls/rasapi16.dll16/__install-lib__ dlls/rasapi16.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rasapi16.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rasapi16.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rasapi16.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18391,8 +18391,8 @@ dlls/rasapi32/librasapi32.$IMPLIBEXT dlls/rasapi32/librasapi32.cross.a: tools/wi
 dlls/rasapi32/librasapi32.$IMPLIBEXT dlls/rasapi32/librasapi32.cross.a: dlls/rasapi32/rasapi32.spec dlls/rasapi32/Makefile
 	@cd dlls/rasapi32 && \$(MAKE) \`basename \$@\`
 dlls/rasapi32 dlls/rasapi32/__install__ dlls/rasapi32/__install-lib__ dlls/rasapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rasapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rasapi32"
 test "x$enable_rasapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rasapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18411,8 +18411,8 @@ rasapi32_test.exe: \$(TOPOBJDIR)/dlls/rasapi32/tests/rasapi32_test.exe$DLLEXT
 rasapi32_test.rc:
 	echo \"rasapi32_test.exe TESTRES \\\"rasapi32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 rasapi32_test.res: rasapi32_test.rc rasapi32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rasapi32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rasapi32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/rasapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18427,8 +18427,8 @@ dlls/rasdlg/librasdlg.$IMPLIBEXT dlls/rasdlg/librasdlg.cross.a: tools/widl tools
 dlls/rasdlg/librasdlg.$IMPLIBEXT dlls/rasdlg/librasdlg.cross.a: dlls/rasdlg/rasdlg.spec dlls/rasdlg/Makefile
 	@cd dlls/rasdlg && \$(MAKE) \`basename \$@\`
 dlls/rasdlg dlls/rasdlg/__install__ dlls/rasdlg/__install-lib__ dlls/rasdlg/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rasdlg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rasdlg"
 test "x$enable_rasdlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rasdlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18443,8 +18443,8 @@ dlls/resutils/libresutils.$IMPLIBEXT dlls/resutils/libresutils.cross.a: tools/wi
 dlls/resutils/libresutils.$IMPLIBEXT dlls/resutils/libresutils.cross.a: dlls/resutils/resutils.spec dlls/resutils/Makefile
 	@cd dlls/resutils && \$(MAKE) \`basename \$@\`
 dlls/resutils dlls/resutils/__install__ dlls/resutils/__install-lib__ dlls/resutils/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/resutils/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/resutils"
 test "x$enable_resutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/resutils"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18459,8 +18459,8 @@ dlls/riched20/libriched20.$IMPLIBEXT dlls/riched20/libriched20.cross.a: tools/wi
 dlls/riched20/libriched20.$IMPLIBEXT dlls/riched20/libriched20.cross.a: dlls/riched20/riched20.spec dlls/riched20/Makefile
 	@cd dlls/riched20 && \$(MAKE) \`basename \$@\`
 dlls/riched20 dlls/riched20/__install__ dlls/riched20/__install-lib__ dlls/riched20/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/riched20/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/riched20"
 test "x$enable_riched20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/riched20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18479,8 +18479,8 @@ riched20_test.exe: \$(TOPOBJDIR)/dlls/riched20/tests/riched20_test.exe$DLLEXT
 riched20_test.rc:
 	echo \"riched20_test.exe TESTRES \\\"riched20_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 riched20_test.res: riched20_test.rc riched20_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/riched20/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/riched20/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/riched20/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18490,8 +18490,8 @@ ac_config_files="$ac_config_files dlls/riched20/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched32 dlls/riched32/__install__ dlls/riched32/__install-lib__ dlls/riched32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/riched32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/riched32"
 test "x$enable_riched32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/riched32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18510,8 +18510,8 @@ riched32_test.exe: \$(TOPOBJDIR)/dlls/riched32/tests/riched32_test.exe$DLLEXT
 riched32_test.rc:
 	echo \"riched32_test.exe TESTRES \\\"riched32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 riched32_test.res: riched32_test.rc riched32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/riched32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/riched32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/riched32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18526,8 +18526,8 @@ dlls/rpcrt4/librpcrt4.$IMPLIBEXT dlls/rpcrt4/librpcrt4.cross.a: tools/widl tools
 dlls/rpcrt4/librpcrt4.$IMPLIBEXT dlls/rpcrt4/librpcrt4.cross.a: dlls/rpcrt4/rpcrt4.spec dlls/rpcrt4/Makefile
 	@cd dlls/rpcrt4 && \$(MAKE) \`basename \$@\`
 dlls/rpcrt4 dlls/rpcrt4/__install__ dlls/rpcrt4/__install-lib__ dlls/rpcrt4/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rpcrt4/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rpcrt4"
 test "x$enable_rpcrt4" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rpcrt4"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18546,8 +18546,8 @@ rpcrt4_test.exe: \$(TOPOBJDIR)/dlls/rpcrt4/tests/rpcrt4_test.exe$DLLEXT
 rpcrt4_test.rc:
 	echo \"rpcrt4_test.exe TESTRES \\\"rpcrt4_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 rpcrt4_test.res: rpcrt4_test.rc rpcrt4_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rpcrt4/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rpcrt4/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/rpcrt4/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18557,8 +18557,8 @@ ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsabase dlls/rsabase/__install__ dlls/rsabase/__install-lib__ dlls/rsabase/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rsabase/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rsabase"
 test "x$enable_rsabase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rsabase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18573,8 +18573,8 @@ dlls/rsaenh/librsaenh.$IMPLIBEXT dlls/rsaenh/librsaenh.cross.a: tools/widl tools
 dlls/rsaenh/librsaenh.$IMPLIBEXT dlls/rsaenh/librsaenh.cross.a: dlls/rsaenh/rsaenh.spec dlls/rsaenh/Makefile
 	@cd dlls/rsaenh && \$(MAKE) \`basename \$@\`
 dlls/rsaenh dlls/rsaenh/__install__ dlls/rsaenh/__install-lib__ dlls/rsaenh/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rsaenh/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rsaenh"
 test "x$enable_rsaenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rsaenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18593,8 +18593,8 @@ rsaenh_test.exe: \$(TOPOBJDIR)/dlls/rsaenh/tests/rsaenh_test.exe$DLLEXT
 rsaenh_test.rc:
 	echo \"rsaenh_test.exe TESTRES \\\"rsaenh_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 rsaenh_test.res: rsaenh_test.rc rsaenh_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rsaenh/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rsaenh/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/rsaenh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18609,8 +18609,8 @@ dlls/rtutils/librtutils.$IMPLIBEXT dlls/rtutils/librtutils.cross.a: tools/widl t
 dlls/rtutils/librtutils.$IMPLIBEXT dlls/rtutils/librtutils.cross.a: dlls/rtutils/rtutils.spec dlls/rtutils/Makefile
 	@cd dlls/rtutils && \$(MAKE) \`basename \$@\`
 dlls/rtutils dlls/rtutils/__install__ dlls/rtutils/__install-lib__ dlls/rtutils/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/rtutils/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/rtutils"
 test "x$enable_rtutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/rtutils"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18620,8 +18620,8 @@ ac_config_files="$ac_config_files dlls/rtutils/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sane.ds dlls/sane.ds/__install__ dlls/sane.ds/__install-lib__ dlls/sane.ds/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sane.ds/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sane.ds"
 test "x$enable_sane_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sane.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18631,8 +18631,8 @@ ac_config_files="$ac_config_files dlls/sane.ds/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sccbase dlls/sccbase/__install__ dlls/sccbase/__install-lib__ dlls/sccbase/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sccbase/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sccbase"
 test "x$enable_sccbase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sccbase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18642,8 +18642,8 @@ ac_config_files="$ac_config_files dlls/sccbase/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/schannel dlls/schannel/__install__ dlls/schannel/__install-lib__ dlls/schannel/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/schannel/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/schannel"
 test "x$enable_schannel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/schannel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18662,8 +18662,8 @@ schannel_test.exe: \$(TOPOBJDIR)/dlls/schannel/tests/schannel_test.exe$DLLEXT
 schannel_test.rc:
 	echo \"schannel_test.exe TESTRES \\\"schannel_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 schannel_test.res: schannel_test.rc schannel_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/schannel/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/schannel/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/schannel/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18678,8 +18678,8 @@ dlls/secur32/libsecur32.$IMPLIBEXT dlls/secur32/libsecur32.cross.a: tools/widl t
 dlls/secur32/libsecur32.$IMPLIBEXT dlls/secur32/libsecur32.cross.a: dlls/secur32/secur32.spec dlls/secur32/Makefile
 	@cd dlls/secur32 && \$(MAKE) \`basename \$@\`
 dlls/secur32 dlls/secur32/__install__ dlls/secur32/__install-lib__ dlls/secur32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/secur32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/secur32"
 test "x$enable_secur32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/secur32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18698,8 +18698,8 @@ secur32_test.exe: \$(TOPOBJDIR)/dlls/secur32/tests/secur32_test.exe$DLLEXT
 secur32_test.rc:
 	echo \"secur32_test.exe TESTRES \\\"secur32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 secur32_test.res: secur32_test.rc secur32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/secur32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/secur32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/secur32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18709,8 +18709,8 @@ ac_config_files="$ac_config_files dlls/secur32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/security dlls/security/__install__ dlls/security/__install-lib__ dlls/security/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/security/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/security"
 test "x$enable_security" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/security"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18725,8 +18725,8 @@ dlls/sensapi/libsensapi.$IMPLIBEXT dlls/sensapi/libsensapi.cross.a: tools/widl t
 dlls/sensapi/libsensapi.$IMPLIBEXT dlls/sensapi/libsensapi.cross.a: dlls/sensapi/sensapi.spec dlls/sensapi/Makefile
 	@cd dlls/sensapi && \$(MAKE) \`basename \$@\`
 dlls/sensapi dlls/sensapi/__install__ dlls/sensapi/__install-lib__ dlls/sensapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sensapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sensapi"
 test "x$enable_sensapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sensapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18741,8 +18741,8 @@ dlls/serialui/libserialui.$IMPLIBEXT dlls/serialui/libserialui.cross.a: tools/wi
 dlls/serialui/libserialui.$IMPLIBEXT dlls/serialui/libserialui.cross.a: dlls/serialui/serialui.spec dlls/serialui/Makefile
 	@cd dlls/serialui && \$(MAKE) \`basename \$@\`
 dlls/serialui dlls/serialui/__install__ dlls/serialui/__install-lib__ dlls/serialui/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/serialui/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/serialui"
 test "x$enable_serialui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/serialui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18761,8 +18761,8 @@ serialui_test.exe: \$(TOPOBJDIR)/dlls/serialui/tests/serialui_test.exe$DLLEXT
 serialui_test.rc:
 	echo \"serialui_test.exe TESTRES \\\"serialui_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 serialui_test.res: serialui_test.rc serialui_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/serialui/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/serialui/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/serialui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18777,8 +18777,8 @@ dlls/setupapi/libsetupapi.$IMPLIBEXT dlls/setupapi/libsetupapi.cross.a: tools/wi
 dlls/setupapi/libsetupapi.$IMPLIBEXT dlls/setupapi/libsetupapi.cross.a: dlls/setupapi/setupapi.spec dlls/setupapi/Makefile
 	@cd dlls/setupapi && \$(MAKE) \`basename \$@\`
 dlls/setupapi dlls/setupapi/__install__ dlls/setupapi/__install-lib__ dlls/setupapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/setupapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/setupapi"
 test "x$enable_setupapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/setupapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18797,8 +18797,8 @@ setupapi_test.exe: \$(TOPOBJDIR)/dlls/setupapi/tests/setupapi_test.exe$DLLEXT
 setupapi_test.rc:
 	echo \"setupapi_test.exe TESTRES \\\"setupapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 setupapi_test.res: setupapi_test.rc setupapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/setupapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/setupapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/setupapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18808,8 +18808,8 @@ ac_config_files="$ac_config_files dlls/setupapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/setupx.dll16 dlls/setupx.dll16/__install__ dlls/setupx.dll16/__install-lib__ dlls/setupx.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/setupx.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/setupx.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/setupx.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18824,8 +18824,8 @@ dlls/sfc/libsfc.$IMPLIBEXT dlls/sfc/libsfc.cross.a: tools/widl tools/winebuild t
 dlls/sfc/libsfc.$IMPLIBEXT dlls/sfc/libsfc.cross.a: dlls/sfc/sfc.spec dlls/sfc/Makefile
 	@cd dlls/sfc && \$(MAKE) \`basename \$@\`
 dlls/sfc dlls/sfc/__install__ dlls/sfc/__install-lib__ dlls/sfc/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sfc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sfc"
 test "x$enable_sfc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sfc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18840,8 +18840,8 @@ dlls/sfc_os/libsfc_os.$IMPLIBEXT dlls/sfc_os/libsfc_os.cross.a: tools/widl tools
 dlls/sfc_os/libsfc_os.$IMPLIBEXT dlls/sfc_os/libsfc_os.cross.a: dlls/sfc_os/sfc_os.spec dlls/sfc_os/Makefile
 	@cd dlls/sfc_os && \$(MAKE) \`basename \$@\`
 dlls/sfc_os dlls/sfc_os/__install__ dlls/sfc_os/__install-lib__ dlls/sfc_os/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sfc_os/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sfc_os"
 test "x$enable_sfc_os" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sfc_os"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18851,8 +18851,8 @@ ac_config_files="$ac_config_files dlls/sfc_os/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdoclc dlls/shdoclc/__install__ dlls/shdoclc/__install-lib__ dlls/shdoclc/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shdoclc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shdoclc"
 test "x$enable_shdoclc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shdoclc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18867,8 +18867,8 @@ dlls/shdocvw/libshdocvw.$IMPLIBEXT dlls/shdocvw/libshdocvw.cross.a: tools/widl t
 dlls/shdocvw/libshdocvw.$IMPLIBEXT dlls/shdocvw/libshdocvw.cross.a: dlls/shdocvw/shdocvw.spec dlls/shdocvw/Makefile
 	@cd dlls/shdocvw && \$(MAKE) \`basename \$@\`
 dlls/shdocvw dlls/shdocvw/__install__ dlls/shdocvw/__install-lib__ dlls/shdocvw/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shdocvw/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shdocvw"
 test "x$enable_shdocvw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shdocvw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18887,8 +18887,8 @@ shdocvw_test.exe: \$(TOPOBJDIR)/dlls/shdocvw/tests/shdocvw_test.exe$DLLEXT
 shdocvw_test.rc:
 	echo \"shdocvw_test.exe TESTRES \\\"shdocvw_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 shdocvw_test.res: shdocvw_test.rc shdocvw_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shdocvw/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shdocvw/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/shdocvw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18898,8 +18898,8 @@ ac_config_files="$ac_config_files dlls/shdocvw/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shell.dll16 dlls/shell.dll16/__install__ dlls/shell.dll16/__install-lib__ dlls/shell.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shell.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shell.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shell.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18914,8 +18914,8 @@ dlls/shell32/libshell32.$IMPLIBEXT dlls/shell32/libshell32.cross.a: tools/widl t
 dlls/shell32/libshell32.$IMPLIBEXT dlls/shell32/libshell32.cross.a: dlls/shell32/shell32.spec dlls/shell32/Makefile
 	@cd dlls/shell32 && \$(MAKE) \`basename \$@\`
 dlls/shell32 dlls/shell32/__install__ dlls/shell32/__install-lib__ dlls/shell32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shell32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shell32"
 test "x$enable_shell32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shell32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18934,8 +18934,8 @@ shell32_test.exe: \$(TOPOBJDIR)/dlls/shell32/tests/shell32_test.exe$DLLEXT
 shell32_test.rc:
 	echo \"shell32_test.exe TESTRES \\\"shell32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 shell32_test.res: shell32_test.rc shell32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shell32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shell32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/shell32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18950,8 +18950,8 @@ dlls/shfolder/libshfolder.$IMPLIBEXT dlls/shfolder/libshfolder.cross.a: tools/wi
 dlls/shfolder/libshfolder.$IMPLIBEXT dlls/shfolder/libshfolder.cross.a: dlls/shfolder/shfolder.spec dlls/shfolder/Makefile
 	@cd dlls/shfolder && \$(MAKE) \`basename \$@\`
 dlls/shfolder dlls/shfolder/__install__ dlls/shfolder/__install-lib__ dlls/shfolder/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shfolder/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shfolder"
 test "x$enable_shfolder" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shfolder"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18966,8 +18966,8 @@ dlls/shlwapi/libshlwapi.$IMPLIBEXT dlls/shlwapi/libshlwapi.cross.a: tools/widl t
 dlls/shlwapi/libshlwapi.$IMPLIBEXT dlls/shlwapi/libshlwapi.cross.a: dlls/shlwapi/shlwapi.spec dlls/shlwapi/Makefile
 	@cd dlls/shlwapi && \$(MAKE) \`basename \$@\`
 dlls/shlwapi dlls/shlwapi/__install__ dlls/shlwapi/__install-lib__ dlls/shlwapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shlwapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shlwapi"
 test "x$enable_shlwapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/shlwapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18986,8 +18986,8 @@ shlwapi_test.exe: \$(TOPOBJDIR)/dlls/shlwapi/tests/shlwapi_test.exe$DLLEXT
 shlwapi_test.rc:
 	echo \"shlwapi_test.exe TESTRES \\\"shlwapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 shlwapi_test.res: shlwapi_test.rc shlwapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/shlwapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/shlwapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/shlwapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -18997,8 +18997,8 @@ ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/slbcsp dlls/slbcsp/__install__ dlls/slbcsp/__install-lib__ dlls/slbcsp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/slbcsp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/slbcsp"
 test "x$enable_slbcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/slbcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19013,8 +19013,8 @@ dlls/slc/libslc.$IMPLIBEXT dlls/slc/libslc.cross.a: tools/widl tools/winebuild t
 dlls/slc/libslc.$IMPLIBEXT dlls/slc/libslc.cross.a: dlls/slc/slc.spec dlls/slc/Makefile
 	@cd dlls/slc && \$(MAKE) \`basename \$@\`
 dlls/slc dlls/slc/__install__ dlls/slc/__install-lib__ dlls/slc/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/slc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/slc"
 test "x$enable_slc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/slc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19029,8 +19029,8 @@ dlls/snmpapi/libsnmpapi.$IMPLIBEXT dlls/snmpapi/libsnmpapi.cross.a: tools/widl t
 dlls/snmpapi/libsnmpapi.$IMPLIBEXT dlls/snmpapi/libsnmpapi.cross.a: dlls/snmpapi/snmpapi.spec dlls/snmpapi/Makefile
 	@cd dlls/snmpapi && \$(MAKE) \`basename \$@\`
 dlls/snmpapi dlls/snmpapi/__install__ dlls/snmpapi/__install-lib__ dlls/snmpapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/snmpapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/snmpapi"
 test "x$enable_snmpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/snmpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19049,8 +19049,8 @@ snmpapi_test.exe: \$(TOPOBJDIR)/dlls/snmpapi/tests/snmpapi_test.exe$DLLEXT
 snmpapi_test.rc:
 	echo \"snmpapi_test.exe TESTRES \\\"snmpapi_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 snmpapi_test.res: snmpapi_test.rc snmpapi_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/snmpapi/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/snmpapi/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/snmpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19060,8 +19060,8 @@ ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/softpub dlls/softpub/__install__ dlls/softpub/__install-lib__ dlls/softpub/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/softpub/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/softpub"
 test "x$enable_softpub" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/softpub"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19071,8 +19071,8 @@ ac_config_files="$ac_config_files dlls/softpub/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sound.drv16 dlls/sound.drv16/__install__ dlls/sound.drv16/__install-lib__ dlls/sound.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sound.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sound.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sound.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19087,8 +19087,8 @@ dlls/spoolss/libspoolss.$IMPLIBEXT dlls/spoolss/libspoolss.cross.a: tools/widl t
 dlls/spoolss/libspoolss.$IMPLIBEXT dlls/spoolss/libspoolss.cross.a: dlls/spoolss/spoolss.spec dlls/spoolss/Makefile
 	@cd dlls/spoolss && \$(MAKE) \`basename \$@\`
 dlls/spoolss dlls/spoolss/__install__ dlls/spoolss/__install-lib__ dlls/spoolss/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/spoolss/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/spoolss"
 test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/spoolss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19107,8 +19107,8 @@ spoolss_test.exe: \$(TOPOBJDIR)/dlls/spoolss/tests/spoolss_test.exe$DLLEXT
 spoolss_test.rc:
 	echo \"spoolss_test.exe TESTRES \\\"spoolss_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 spoolss_test.res: spoolss_test.rc spoolss_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/spoolss/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/spoolss/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/spoolss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19118,8 +19118,8 @@ ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole2.tlb dlls/stdole2.tlb/__install__ dlls/stdole2.tlb/__install-lib__ dlls/stdole2.tlb/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/stdole2.tlb/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/stdole2.tlb"
 test "x$enable_stdole2_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/stdole2.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19129,8 +19129,8 @@ ac_config_files="$ac_config_files dlls/stdole2.tlb/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole32.tlb dlls/stdole32.tlb/__install__ dlls/stdole32.tlb/__install-lib__ dlls/stdole32.tlb/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/stdole32.tlb/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/stdole32.tlb"
 test "x$enable_stdole32_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/stdole32.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19145,8 +19145,8 @@ dlls/sti/libsti.$IMPLIBEXT dlls/sti/libsti.cross.a: tools/widl tools/winebuild t
 dlls/sti/libsti.$IMPLIBEXT dlls/sti/libsti.cross.a: dlls/sti/sti.spec dlls/sti/Makefile
 	@cd dlls/sti && \$(MAKE) \`basename \$@\`
 dlls/sti dlls/sti/__install__ dlls/sti/__install-lib__ dlls/sti/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sti/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sti"
 test "x$enable_sti" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sti"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19165,8 +19165,8 @@ sti_test.exe: \$(TOPOBJDIR)/dlls/sti/tests/sti_test.exe$DLLEXT
 sti_test.rc:
 	echo \"sti_test.exe TESTRES \\\"sti_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 sti_test.res: sti_test.rc sti_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sti/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sti/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/sti/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19176,8 +19176,8 @@ ac_config_files="$ac_config_files dlls/sti/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/storage.dll16 dlls/storage.dll16/__install__ dlls/storage.dll16/__install-lib__ dlls/storage.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/storage.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/storage.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/storage.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19187,8 +19187,8 @@ ac_config_files="$ac_config_files dlls/storage.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stress.dll16 dlls/stress.dll16/__install__ dlls/stress.dll16/__install-lib__ dlls/stress.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/stress.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/stress.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/stress.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19203,8 +19203,8 @@ dlls/strmiids: tools/widl tools/winebuild tools/winegcc include
 dlls/strmiids/__install__ dlls/strmiids/__install-dev__: dlls/strmiids
 dlls/strmiids/libstrmiids.cross.a: dlls/strmiids/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/strmiids && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/strmiids/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/strmiids"
 test "x$enable_strmiids" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/strmiids"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19214,8 +19214,8 @@ ac_config_files="$ac_config_files dlls/strmiids/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/svrapi dlls/svrapi/__install__ dlls/svrapi/__install-lib__ dlls/svrapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/svrapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/svrapi"
 test "x$enable_svrapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/svrapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19225,8 +19225,8 @@ ac_config_files="$ac_config_files dlls/svrapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sxs dlls/sxs/__install__ dlls/sxs/__install-lib__ dlls/sxs/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/sxs/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/sxs"
 test "x$enable_sxs" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/sxs"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19236,8 +19236,8 @@ ac_config_files="$ac_config_files dlls/sxs/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/system.drv16 dlls/system.drv16/__install__ dlls/system.drv16/__install-lib__ dlls/system.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/system.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/system.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/system.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19247,8 +19247,8 @@ ac_config_files="$ac_config_files dlls/system.drv16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/t2embed dlls/t2embed/__install__ dlls/t2embed/__install-lib__ dlls/t2embed/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/t2embed/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/t2embed"
 test "x$enable_t2embed" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/t2embed"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19263,8 +19263,8 @@ dlls/tapi32/libtapi32.$IMPLIBEXT dlls/tapi32/libtapi32.cross.a: tools/widl tools
 dlls/tapi32/libtapi32.$IMPLIBEXT dlls/tapi32/libtapi32.cross.a: dlls/tapi32/tapi32.spec dlls/tapi32/Makefile
 	@cd dlls/tapi32 && \$(MAKE) \`basename \$@\`
 dlls/tapi32 dlls/tapi32/__install__ dlls/tapi32/__install-lib__ dlls/tapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/tapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/tapi32"
 test "x$enable_tapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/tapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19274,8 +19274,8 @@ ac_config_files="$ac_config_files dlls/tapi32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/toolhelp.dll16 dlls/toolhelp.dll16/__install__ dlls/toolhelp.dll16/__install-lib__ dlls/toolhelp.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/toolhelp.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/toolhelp.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/toolhelp.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19285,8 +19285,8 @@ ac_config_files="$ac_config_files dlls/toolhelp.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/traffic dlls/traffic/__install__ dlls/traffic/__install-lib__ dlls/traffic/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/traffic/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/traffic"
 test "x$enable_traffic" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/traffic"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19296,8 +19296,8 @@ ac_config_files="$ac_config_files dlls/traffic/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/twain.dll16 dlls/twain.dll16/__install__ dlls/twain.dll16/__install-lib__ dlls/twain.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/twain.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/twain.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/twain.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19307,8 +19307,8 @@ ac_config_files="$ac_config_files dlls/twain.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/twain_32 dlls/twain_32/__install__ dlls/twain_32/__install-lib__ dlls/twain_32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/twain_32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/twain_32"
 test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/twain_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19327,8 +19327,8 @@ twain_32_test.exe: \$(TOPOBJDIR)/dlls/twain_32/tests/twain_32_test.exe$DLLEXT
 twain_32_test.rc:
 	echo \"twain_32_test.exe TESTRES \\\"twain_32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 twain_32_test.res: twain_32_test.rc twain_32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/twain_32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/twain_32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/twain_32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19338,8 +19338,8 @@ ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/typelib.dll16 dlls/typelib.dll16/__install__ dlls/typelib.dll16/__install-lib__ dlls/typelib.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/typelib.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/typelib.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/typelib.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19354,8 +19354,8 @@ dlls/unicows/libunicows.$IMPLIBEXT dlls/unicows/libunicows.cross.a: tools/widl t
 dlls/unicows/libunicows.$IMPLIBEXT dlls/unicows/libunicows.cross.a: dlls/unicows/unicows.spec dlls/unicows/Makefile
 	@cd dlls/unicows && \$(MAKE) \`basename \$@\`
 dlls/unicows dlls/unicows/__install__ dlls/unicows/__install-lib__ dlls/unicows/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/unicows/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/unicows"
 test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/unicows"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19365,8 +19365,8 @@ ac_config_files="$ac_config_files dlls/unicows/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/updspapi dlls/updspapi/__install__ dlls/updspapi/__install-lib__ dlls/updspapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/updspapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/updspapi"
 test "x$enable_updspapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/updspapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19381,8 +19381,8 @@ dlls/url/liburl.$IMPLIBEXT dlls/url/liburl.cross.a: tools/widl tools/winebuild t
 dlls/url/liburl.$IMPLIBEXT dlls/url/liburl.cross.a: dlls/url/url.spec dlls/url/Makefile
 	@cd dlls/url && \$(MAKE) \`basename \$@\`
 dlls/url dlls/url/__install__ dlls/url/__install-lib__ dlls/url/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/url/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/url"
 test "x$enable_url" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/url"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19397,8 +19397,8 @@ dlls/urlmon/liburlmon.$IMPLIBEXT dlls/urlmon/liburlmon.cross.a: tools/widl tools
 dlls/urlmon/liburlmon.$IMPLIBEXT dlls/urlmon/liburlmon.cross.a: dlls/urlmon/urlmon.spec dlls/urlmon/Makefile
 	@cd dlls/urlmon && \$(MAKE) \`basename \$@\`
 dlls/urlmon dlls/urlmon/__install__ dlls/urlmon/__install-lib__ dlls/urlmon/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/urlmon/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/urlmon"
 test "x$enable_urlmon" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/urlmon"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19417,8 +19417,8 @@ urlmon_test.exe: \$(TOPOBJDIR)/dlls/urlmon/tests/urlmon_test.exe$DLLEXT
 urlmon_test.rc:
 	echo \"urlmon_test.exe TESTRES \\\"urlmon_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 urlmon_test.res: urlmon_test.rc urlmon_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/urlmon/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/urlmon/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/urlmon/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19428,8 +19428,8 @@ ac_config_files="$ac_config_files dlls/urlmon/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/user.exe16 dlls/user.exe16/__install__ dlls/user.exe16/__install-lib__ dlls/user.exe16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/user.exe16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/user.exe16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/user.exe16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19444,8 +19444,8 @@ dlls/user32/libuser32.$IMPLIBEXT dlls/user32/libuser32.cross.a: tools/widl tools
 dlls/user32/libuser32.$IMPLIBEXT dlls/user32/libuser32.cross.a: dlls/user32/user32.spec dlls/user32/Makefile
 	@cd dlls/user32 && \$(MAKE) \`basename \$@\`
 dlls/user32 dlls/user32/__install__ dlls/user32/__install-lib__ dlls/user32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/user32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/user32"
 test "x$enable_user32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/user32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19464,8 +19464,8 @@ user32_test.exe: \$(TOPOBJDIR)/dlls/user32/tests/user32_test.exe$DLLEXT
 user32_test.rc:
 	echo \"user32_test.exe TESTRES \\\"user32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 user32_test.res: user32_test.rc user32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/user32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/user32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/user32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19480,8 +19480,8 @@ dlls/userenv/libuserenv.$IMPLIBEXT dlls/userenv/libuserenv.cross.a: tools/widl t
 dlls/userenv/libuserenv.$IMPLIBEXT dlls/userenv/libuserenv.cross.a: dlls/userenv/userenv.spec dlls/userenv/Makefile
 	@cd dlls/userenv && \$(MAKE) \`basename \$@\`
 dlls/userenv dlls/userenv/__install__ dlls/userenv/__install-lib__ dlls/userenv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/userenv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/userenv"
 test "x$enable_userenv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/userenv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19500,8 +19500,8 @@ userenv_test.exe: \$(TOPOBJDIR)/dlls/userenv/tests/userenv_test.exe$DLLEXT
 userenv_test.rc:
 	echo \"userenv_test.exe TESTRES \\\"userenv_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 userenv_test.res: userenv_test.rc userenv_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/userenv/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/userenv/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/userenv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19516,8 +19516,8 @@ dlls/usp10/libusp10.$IMPLIBEXT dlls/usp10/libusp10.cross.a: tools/widl tools/win
 dlls/usp10/libusp10.$IMPLIBEXT dlls/usp10/libusp10.cross.a: dlls/usp10/usp10.spec dlls/usp10/Makefile
 	@cd dlls/usp10 && \$(MAKE) \`basename \$@\`
 dlls/usp10 dlls/usp10/__install__ dlls/usp10/__install-lib__ dlls/usp10/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/usp10/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/usp10"
 test "x$enable_usp10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/usp10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19536,8 +19536,8 @@ usp10_test.exe: \$(TOPOBJDIR)/dlls/usp10/tests/usp10_test.exe$DLLEXT
 usp10_test.rc:
 	echo \"usp10_test.exe TESTRES \\\"usp10_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 usp10_test.res: usp10_test.rc usp10_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/usp10/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/usp10/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/usp10/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19552,8 +19552,8 @@ dlls/uuid: tools/widl tools/winebuild tools/winegcc include
 dlls/uuid/__install__ dlls/uuid/__install-dev__: dlls/uuid
 dlls/uuid/libuuid.cross.a: dlls/uuid/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/uuid && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/uuid/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/uuid"
 test "x$enable_uuid" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/uuid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19568,8 +19568,8 @@ dlls/uxtheme/libuxtheme.$IMPLIBEXT dlls/uxtheme/libuxtheme.cross.a: tools/widl t
 dlls/uxtheme/libuxtheme.$IMPLIBEXT dlls/uxtheme/libuxtheme.cross.a: dlls/uxtheme/uxtheme.spec dlls/uxtheme/Makefile
 	@cd dlls/uxtheme && \$(MAKE) \`basename \$@\`
 dlls/uxtheme dlls/uxtheme/__install__ dlls/uxtheme/__install-lib__ dlls/uxtheme/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/uxtheme/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/uxtheme"
 test "x$enable_uxtheme" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/uxtheme"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19588,8 +19588,8 @@ uxtheme_test.exe: \$(TOPOBJDIR)/dlls/uxtheme/tests/uxtheme_test.exe$DLLEXT
 uxtheme_test.rc:
 	echo \"uxtheme_test.exe TESTRES \\\"uxtheme_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 uxtheme_test.res: uxtheme_test.rc uxtheme_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/uxtheme/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/uxtheme/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/uxtheme/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19599,8 +19599,8 @@ ac_config_files="$ac_config_files dlls/uxtheme/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdhcp.vxd dlls/vdhcp.vxd/__install__ dlls/vdhcp.vxd/__install-lib__ dlls/vdhcp.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vdhcp.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vdhcp.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vdhcp.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19615,8 +19615,8 @@ dlls/vdmdbg/libvdmdbg.$IMPLIBEXT dlls/vdmdbg/libvdmdbg.cross.a: tools/widl tools
 dlls/vdmdbg/libvdmdbg.$IMPLIBEXT dlls/vdmdbg/libvdmdbg.cross.a: dlls/vdmdbg/vdmdbg.spec dlls/vdmdbg/Makefile
 	@cd dlls/vdmdbg && \$(MAKE) \`basename \$@\`
 dlls/vdmdbg dlls/vdmdbg/__install__ dlls/vdmdbg/__install-lib__ dlls/vdmdbg/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vdmdbg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vdmdbg"
 test "x$enable_vdmdbg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vdmdbg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19626,8 +19626,8 @@ ac_config_files="$ac_config_files dlls/vdmdbg/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ver.dll16 dlls/ver.dll16/__install__ dlls/ver.dll16/__install-lib__ dlls/ver.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ver.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ver.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ver.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19642,8 +19642,8 @@ dlls/version/libversion.$IMPLIBEXT dlls/version/libversion.cross.a: tools/widl t
 dlls/version/libversion.$IMPLIBEXT dlls/version/libversion.cross.a: dlls/version/version.spec dlls/version/Makefile
 	@cd dlls/version && \$(MAKE) \`basename \$@\`
 dlls/version dlls/version/__install__ dlls/version/__install-lib__ dlls/version/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/version/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/version"
 test "x$enable_version" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/version"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19662,8 +19662,8 @@ version_test.exe: \$(TOPOBJDIR)/dlls/version/tests/version_test.exe$DLLEXT
 version_test.rc:
 	echo \"version_test.exe TESTRES \\\"version_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 version_test.res: version_test.rc version_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/version/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/version/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/version/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19673,8 +19673,8 @@ ac_config_files="$ac_config_files dlls/version/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vmm.vxd dlls/vmm.vxd/__install__ dlls/vmm.vxd/__install-lib__ dlls/vmm.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vmm.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vmm.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vmm.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19684,8 +19684,8 @@ ac_config_files="$ac_config_files dlls/vmm.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnbt.vxd dlls/vnbt.vxd/__install__ dlls/vnbt.vxd/__install-lib__ dlls/vnbt.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vnbt.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vnbt.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vnbt.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19695,8 +19695,8 @@ ac_config_files="$ac_config_files dlls/vnbt.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnetbios.vxd dlls/vnetbios.vxd/__install__ dlls/vnetbios.vxd/__install-lib__ dlls/vnetbios.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vnetbios.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vnetbios.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vnetbios.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19706,8 +19706,8 @@ ac_config_files="$ac_config_files dlls/vnetbios.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vtdapi.vxd dlls/vtdapi.vxd/__install__ dlls/vtdapi.vxd/__install-lib__ dlls/vtdapi.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vtdapi.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vtdapi.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vtdapi.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19717,8 +19717,8 @@ ac_config_files="$ac_config_files dlls/vtdapi.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vwin32.vxd dlls/vwin32.vxd/__install__ dlls/vwin32.vxd/__install-lib__ dlls/vwin32.vxd/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/vwin32.vxd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/vwin32.vxd"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/vwin32.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19728,8 +19728,8 @@ ac_config_files="$ac_config_files dlls/vwin32.vxd/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/w32skrnl dlls/w32skrnl/__install__ dlls/w32skrnl/__install-lib__ dlls/w32skrnl/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/w32skrnl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/w32skrnl"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/w32skrnl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19739,8 +19739,8 @@ ac_config_files="$ac_config_files dlls/w32skrnl/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/w32sys.dll16 dlls/w32sys.dll16/__install__ dlls/w32sys.dll16/__install-lib__ dlls/w32sys.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/w32sys.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/w32sys.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/w32sys.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19750,8 +19750,8 @@ ac_config_files="$ac_config_files dlls/w32sys.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wbemprox dlls/wbemprox/__install__ dlls/wbemprox/__install-lib__ dlls/wbemprox/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wbemprox/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wbemprox"
 test "x$enable_wbemprox" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wbemprox"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19761,8 +19761,8 @@ ac_config_files="$ac_config_files dlls/wbemprox/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wiaservc dlls/wiaservc/__install__ dlls/wiaservc/__install-lib__ dlls/wiaservc/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wiaservc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wiaservc"
 test "x$enable_wiaservc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wiaservc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19772,8 +19772,8 @@ ac_config_files="$ac_config_files dlls/wiaservc/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/win32s16.dll16 dlls/win32s16.dll16/__install__ dlls/win32s16.dll16/__install-lib__ dlls/win32s16.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/win32s16.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/win32s16.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/win32s16.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19783,8 +19783,8 @@ ac_config_files="$ac_config_files dlls/win32s16.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/win87em.dll16 dlls/win87em.dll16/__install__ dlls/win87em.dll16/__install-lib__ dlls/win87em.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/win87em.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/win87em.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/win87em.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19794,8 +19794,8 @@ ac_config_files="$ac_config_files dlls/win87em.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winaspi.dll16 dlls/winaspi.dll16/__install__ dlls/winaspi.dll16/__install-lib__ dlls/winaspi.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winaspi.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winaspi.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winaspi.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19805,8 +19805,8 @@ ac_config_files="$ac_config_files dlls/winaspi.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/windebug.dll16 dlls/windebug.dll16/__install__ dlls/windebug.dll16/__install-lib__ dlls/windebug.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/windebug.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/windebug.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/windebug.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19821,8 +19821,8 @@ dlls/windowscodecs/libwindowscodecs.$IMPLIBEXT dlls/windowscodecs/libwindowscode
 dlls/windowscodecs/libwindowscodecs.$IMPLIBEXT dlls/windowscodecs/libwindowscodecs.cross.a: dlls/windowscodecs/windowscodecs.spec dlls/windowscodecs/Makefile
 	@cd dlls/windowscodecs && \$(MAKE) \`basename \$@\`
 dlls/windowscodecs dlls/windowscodecs/__install__ dlls/windowscodecs/__install-lib__ dlls/windowscodecs/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/windowscodecs/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/windowscodecs"
 test "x$enable_windowscodecs" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/windowscodecs"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19841,8 +19841,8 @@ windowscodecs_test.exe: \$(TOPOBJDIR)/dlls/windowscodecs/tests/windowscodecs_tes
 windowscodecs_test.rc:
 	echo \"windowscodecs_test.exe TESTRES \\\"windowscodecs_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 windowscodecs_test.res: windowscodecs_test.rc windowscodecs_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/windowscodecs/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/windowscodecs/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/windowscodecs/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19852,8 +19852,8 @@ ac_config_files="$ac_config_files dlls/windowscodecs/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winealsa.drv dlls/winealsa.drv/__install__ dlls/winealsa.drv/__install-lib__ dlls/winealsa.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winealsa.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winealsa.drv"
 test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winealsa.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19863,8 +19863,8 @@ ac_config_files="$ac_config_files dlls/winealsa.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineaudioio.drv dlls/wineaudioio.drv/__install__ dlls/wineaudioio.drv/__install-lib__ dlls/wineaudioio.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wineaudioio.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wineaudioio.drv"
 test "x$enable_wineaudioio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wineaudioio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19874,8 +19874,8 @@ ac_config_files="$ac_config_files dlls/wineaudioio.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winecoreaudio.drv dlls/winecoreaudio.drv/__install__ dlls/winecoreaudio.drv/__install-lib__ dlls/winecoreaudio.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winecoreaudio.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winecoreaudio.drv"
 test "x$enable_winecoreaudio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winecoreaudio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19890,8 +19890,8 @@ dlls/winecrt0: tools/widl tools/winebuild tools/winegcc include
 dlls/winecrt0/__install__ dlls/winecrt0/__install-dev__: dlls/winecrt0
 dlls/winecrt0/libwinecrt0.cross.a: dlls/winecrt0/Makefile tools/widl tools/winebuild tools/winegcc include dummy
 	@cd dlls/winecrt0 && \$(MAKE) \`basename \$@\`"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winecrt0/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winecrt0"
 test "x$enable_winecrt0" != xno && ALL_STATICLIB_DIRS="$ALL_STATICLIB_DIRS \\
 	dlls/winecrt0"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19906,8 +19906,8 @@ dlls/wined3d/libwined3d.$IMPLIBEXT dlls/wined3d/libwined3d.cross.a: tools/widl t
 dlls/wined3d/libwined3d.$IMPLIBEXT dlls/wined3d/libwined3d.cross.a: dlls/wined3d/wined3d.spec dlls/wined3d/Makefile
 	@cd dlls/wined3d && \$(MAKE) \`basename \$@\`
 dlls/wined3d dlls/wined3d/__install__ dlls/wined3d/__install-lib__ dlls/wined3d/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wined3d/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wined3d"
 test "x$enable_wined3d" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wined3d"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19917,8 +19917,8 @@ ac_config_files="$ac_config_files dlls/wined3d/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineesd.drv dlls/wineesd.drv/__install__ dlls/wineesd.drv/__install-lib__ dlls/wineesd.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wineesd.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wineesd.drv"
 test "x$enable_wineesd_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wineesd.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19928,8 +19928,8 @@ ac_config_files="$ac_config_files dlls/wineesd.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejack.drv dlls/winejack.drv/__install__ dlls/winejack.drv/__install-lib__ dlls/winejack.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winejack.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winejack.drv"
 test "x$enable_winejack_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winejack.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19939,8 +19939,8 @@ ac_config_files="$ac_config_files dlls/winejack.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejoystick.drv dlls/winejoystick.drv/__install__ dlls/winejoystick.drv/__install-lib__ dlls/winejoystick.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winejoystick.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winejoystick.drv"
 test "x$enable_winejoystick_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winejoystick.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19950,8 +19950,8 @@ ac_config_files="$ac_config_files dlls/winejoystick.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winemapi dlls/winemapi/__install__ dlls/winemapi/__install-lib__ dlls/winemapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winemapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winemapi"
 test "x$enable_winemapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winemapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19961,8 +19961,8 @@ ac_config_files="$ac_config_files dlls/winemapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winemp3.acm dlls/winemp3.acm/__install__ dlls/winemp3.acm/__install-lib__ dlls/winemp3.acm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winemp3.acm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winemp3.acm"
 test "x$enable_winemp3_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winemp3.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19972,8 +19972,8 @@ ac_config_files="$ac_config_files dlls/winemp3.acm/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winenas.drv dlls/winenas.drv/__install__ dlls/winenas.drv/__install-lib__ dlls/winenas.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winenas.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winenas.drv"
 test "x$enable_winenas_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winenas.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19983,8 +19983,8 @@ ac_config_files="$ac_config_files dlls/winenas.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineoss.drv dlls/wineoss.drv/__install__ dlls/wineoss.drv/__install-lib__ dlls/wineoss.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wineoss.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wineoss.drv"
 test "x$enable_wineoss_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wineoss.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -19994,8 +19994,8 @@ ac_config_files="$ac_config_files dlls/wineoss.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineps.drv dlls/wineps.drv/__install__ dlls/wineps.drv/__install-lib__ dlls/wineps.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wineps.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wineps.drv"
 test "x$enable_wineps_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wineps.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20005,8 +20005,8 @@ ac_config_files="$ac_config_files dlls/wineps.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineps16.drv16 dlls/wineps16.drv16/__install__ dlls/wineps16.drv16/__install-lib__ dlls/wineps16.drv16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wineps16.drv16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wineps16.drv16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wineps16.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20016,8 +20016,8 @@ ac_config_files="$ac_config_files dlls/wineps16.drv16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winequartz.drv dlls/winequartz.drv/__install__ dlls/winequartz.drv/__install-lib__ dlls/winequartz.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winequartz.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winequartz.drv"
 test "x$enable_winequartz_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winequartz.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20027,8 +20027,8 @@ ac_config_files="$ac_config_files dlls/winequartz.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winex11.drv dlls/winex11.drv/__install__ dlls/winex11.drv/__install-lib__ dlls/winex11.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winex11.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winex11.drv"
 test "x$enable_winex11_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winex11.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20038,8 +20038,8 @@ ac_config_files="$ac_config_files dlls/winex11.drv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wing.dll16 dlls/wing.dll16/__install__ dlls/wing.dll16/__install-lib__ dlls/wing.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wing.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wing.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wing.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20049,8 +20049,8 @@ ac_config_files="$ac_config_files dlls/wing.dll16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wing32 dlls/wing32/__install__ dlls/wing32/__install-lib__ dlls/wing32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wing32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wing32"
 test "x$enable_wing32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wing32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20065,8 +20065,8 @@ dlls/winhttp/libwinhttp.$IMPLIBEXT dlls/winhttp/libwinhttp.cross.a: tools/widl t
 dlls/winhttp/libwinhttp.$IMPLIBEXT dlls/winhttp/libwinhttp.cross.a: dlls/winhttp/winhttp.spec dlls/winhttp/Makefile
 	@cd dlls/winhttp && \$(MAKE) \`basename \$@\`
 dlls/winhttp dlls/winhttp/__install__ dlls/winhttp/__install-lib__ dlls/winhttp/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winhttp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winhttp"
 test "x$enable_winhttp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winhttp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20085,8 +20085,8 @@ winhttp_test.exe: \$(TOPOBJDIR)/dlls/winhttp/tests/winhttp_test.exe$DLLEXT
 winhttp_test.rc:
 	echo \"winhttp_test.exe TESTRES \\\"winhttp_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 winhttp_test.res: winhttp_test.rc winhttp_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winhttp/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winhttp/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/winhttp/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20101,8 +20101,8 @@ dlls/wininet/libwininet.$IMPLIBEXT dlls/wininet/libwininet.cross.a: tools/widl t
 dlls/wininet/libwininet.$IMPLIBEXT dlls/wininet/libwininet.cross.a: dlls/wininet/wininet.spec dlls/wininet/Makefile
 	@cd dlls/wininet && \$(MAKE) \`basename \$@\`
 dlls/wininet dlls/wininet/__install__ dlls/wininet/__install-lib__ dlls/wininet/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wininet/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wininet"
 test "x$enable_wininet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wininet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20121,8 +20121,8 @@ wininet_test.exe: \$(TOPOBJDIR)/dlls/wininet/tests/wininet_test.exe$DLLEXT
 wininet_test.rc:
 	echo \"wininet_test.exe TESTRES \\\"wininet_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 wininet_test.res: wininet_test.rc wininet_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wininet/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wininet/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/wininet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20137,8 +20137,8 @@ dlls/winmm/libwinmm.$IMPLIBEXT dlls/winmm/libwinmm.cross.a: tools/widl tools/win
 dlls/winmm/libwinmm.$IMPLIBEXT dlls/winmm/libwinmm.cross.a: dlls/winmm/winmm.spec dlls/winmm/Makefile
 	@cd dlls/winmm && \$(MAKE) \`basename \$@\`
 dlls/winmm dlls/winmm/__install__ dlls/winmm/__install-lib__ dlls/winmm/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winmm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winmm"
 test "x$enable_winmm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winmm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20157,8 +20157,8 @@ winmm_test.exe: \$(TOPOBJDIR)/dlls/winmm/tests/winmm_test.exe$DLLEXT
 winmm_test.rc:
 	echo \"winmm_test.exe TESTRES \\\"winmm_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 winmm_test.res: winmm_test.rc winmm_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winmm/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winmm/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/winmm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20168,8 +20168,8 @@ ac_config_files="$ac_config_files dlls/winmm/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winnls.dll16 dlls/winnls.dll16/__install__ dlls/winnls.dll16/__install-lib__ dlls/winnls.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winnls.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winnls.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winnls.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20184,8 +20184,8 @@ dlls/winnls32/libwinnls32.$IMPLIBEXT dlls/winnls32/libwinnls32.cross.a: tools/wi
 dlls/winnls32/libwinnls32.$IMPLIBEXT dlls/winnls32/libwinnls32.cross.a: dlls/winnls32/winnls32.spec dlls/winnls32/Makefile
 	@cd dlls/winnls32 && \$(MAKE) \`basename \$@\`
 dlls/winnls32 dlls/winnls32/__install__ dlls/winnls32/__install-lib__ dlls/winnls32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winnls32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winnls32"
 test "x$enable_winnls32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winnls32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20200,8 +20200,8 @@ dlls/winscard/libwinscard.$IMPLIBEXT dlls/winscard/libwinscard.cross.a: tools/wi
 dlls/winscard/libwinscard.$IMPLIBEXT dlls/winscard/libwinscard.cross.a: dlls/winscard/winscard.spec dlls/winscard/Makefile
 	@cd dlls/winscard && \$(MAKE) \`basename \$@\`
 dlls/winscard dlls/winscard/__install__ dlls/winscard/__install-lib__ dlls/winscard/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winscard/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winscard"
 test "x$enable_winscard" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winscard"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20211,8 +20211,8 @@ ac_config_files="$ac_config_files dlls/winscard/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winsock.dll16 dlls/winsock.dll16/__install__ dlls/winsock.dll16/__install-lib__ dlls/winsock.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winsock.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winsock.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winsock.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20234,8 +20234,8 @@ clean::
 dlls/winspool.drv/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.cross.a: dlls/winspool.drv/winspool.drv.spec dlls/winspool.drv/Makefile
 	@cd dlls/winspool.drv && \$(MAKE) \`basename \$@\`
 dlls/winspool.drv dlls/winspool.drv/__install__ dlls/winspool.drv/__install-lib__ dlls/winspool.drv/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winspool.drv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winspool.drv"
 test "x$enable_winspool_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/winspool.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20254,8 +20254,8 @@ winspool.drv_test.exe: \$(TOPOBJDIR)/dlls/winspool.drv/tests/winspool.drv_test.e
 winspool.drv_test.rc:
 	echo \"winspool.drv_test.exe TESTRES \\\"winspool.drv_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 winspool.drv_test.res: winspool.drv_test.rc winspool.drv_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/winspool.drv/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/winspool.drv/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/winspool.drv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20265,8 +20265,8 @@ ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintab.dll16 dlls/wintab.dll16/__install__ dlls/wintab.dll16/__install-lib__ dlls/wintab.dll16/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wintab.dll16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wintab.dll16"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wintab.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20281,8 +20281,8 @@ dlls/wintab32/libwintab32.$IMPLIBEXT dlls/wintab32/libwintab32.cross.a: tools/wi
 dlls/wintab32/libwintab32.$IMPLIBEXT dlls/wintab32/libwintab32.cross.a: dlls/wintab32/wintab32.spec dlls/wintab32/Makefile
 	@cd dlls/wintab32 && \$(MAKE) \`basename \$@\`
 dlls/wintab32 dlls/wintab32/__install__ dlls/wintab32/__install-lib__ dlls/wintab32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wintab32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wintab32"
 test "x$enable_wintab32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wintab32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20301,8 +20301,8 @@ wintab32_test.exe: \$(TOPOBJDIR)/dlls/wintab32/tests/wintab32_test.exe$DLLEXT
 wintab32_test.rc:
 	echo \"wintab32_test.exe TESTRES \\\"wintab32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 wintab32_test.res: wintab32_test.rc wintab32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wintab32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wintab32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/wintab32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20317,8 +20317,8 @@ dlls/wintrust/libwintrust.$IMPLIBEXT dlls/wintrust/libwintrust.cross.a: tools/wi
 dlls/wintrust/libwintrust.$IMPLIBEXT dlls/wintrust/libwintrust.cross.a: dlls/wintrust/wintrust.spec dlls/wintrust/Makefile
 	@cd dlls/wintrust && \$(MAKE) \`basename \$@\`
 dlls/wintrust dlls/wintrust/__install__ dlls/wintrust/__install-lib__ dlls/wintrust/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wintrust/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wintrust"
 test "x$enable_wintrust" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wintrust"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20337,8 +20337,8 @@ wintrust_test.exe: \$(TOPOBJDIR)/dlls/wintrust/tests/wintrust_test.exe$DLLEXT
 wintrust_test.rc:
 	echo \"wintrust_test.exe TESTRES \\\"wintrust_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 wintrust_test.res: wintrust_test.rc wintrust_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wintrust/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wintrust/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/wintrust/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20353,8 +20353,8 @@ dlls/wldap32/libwldap32.$IMPLIBEXT dlls/wldap32/libwldap32.cross.a: tools/widl t
 dlls/wldap32/libwldap32.$IMPLIBEXT dlls/wldap32/libwldap32.cross.a: dlls/wldap32/wldap32.spec dlls/wldap32/Makefile
 	@cd dlls/wldap32 && \$(MAKE) \`basename \$@\`
 dlls/wldap32 dlls/wldap32/__install__ dlls/wldap32/__install-lib__ dlls/wldap32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wldap32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wldap32"
 test "x$enable_wldap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wldap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20373,8 +20373,8 @@ wldap32_test.exe: \$(TOPOBJDIR)/dlls/wldap32/tests/wldap32_test.exe$DLLEXT
 wldap32_test.rc:
 	echo \"wldap32_test.exe TESTRES \\\"wldap32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 wldap32_test.res: wldap32_test.rc wldap32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wldap32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wldap32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/wldap32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20384,8 +20384,8 @@ ac_config_files="$ac_config_files dlls/wldap32/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wmi dlls/wmi/__install__ dlls/wmi/__install-lib__ dlls/wmi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wmi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wmi"
 test "x$enable_wmi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wmi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20395,8 +20395,8 @@ ac_config_files="$ac_config_files dlls/wmi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wmiutils dlls/wmiutils/__install__ dlls/wmiutils/__install-lib__ dlls/wmiutils/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wmiutils/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wmiutils"
 test "x$enable_wmiutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wmiutils"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20411,8 +20411,8 @@ dlls/wnaspi32/libwnaspi32.$IMPLIBEXT dlls/wnaspi32/libwnaspi32.cross.a: tools/wi
 dlls/wnaspi32/libwnaspi32.$IMPLIBEXT dlls/wnaspi32/libwnaspi32.cross.a: dlls/wnaspi32/wnaspi32.spec dlls/wnaspi32/Makefile
 	@cd dlls/wnaspi32 && \$(MAKE) \`basename \$@\`
 dlls/wnaspi32 dlls/wnaspi32/__install__ dlls/wnaspi32/__install-lib__ dlls/wnaspi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wnaspi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wnaspi32"
 test "x$enable_wnaspi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wnaspi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20427,8 +20427,8 @@ dlls/wow32/libwow32.$IMPLIBEXT dlls/wow32/libwow32.cross.a: tools/widl tools/win
 dlls/wow32/libwow32.$IMPLIBEXT dlls/wow32/libwow32.cross.a: dlls/wow32/wow32.spec dlls/wow32/Makefile
 	@cd dlls/wow32 && \$(MAKE) \`basename \$@\`
 dlls/wow32 dlls/wow32/__install__ dlls/wow32/__install-lib__ dlls/wow32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wow32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wow32"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wow32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20443,8 +20443,8 @@ dlls/ws2_32/libws2_32.$IMPLIBEXT dlls/ws2_32/libws2_32.cross.a: tools/widl tools
 dlls/ws2_32/libws2_32.$IMPLIBEXT dlls/ws2_32/libws2_32.cross.a: dlls/ws2_32/ws2_32.spec dlls/ws2_32/Makefile
 	@cd dlls/ws2_32 && \$(MAKE) \`basename \$@\`
 dlls/ws2_32 dlls/ws2_32/__install__ dlls/ws2_32/__install-lib__ dlls/ws2_32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ws2_32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ws2_32"
 test "x$enable_ws2_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/ws2_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20463,8 +20463,8 @@ ws2_32_test.exe: \$(TOPOBJDIR)/dlls/ws2_32/tests/ws2_32_test.exe$DLLEXT
 ws2_32_test.rc:
 	echo \"ws2_32_test.exe TESTRES \\\"ws2_32_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 ws2_32_test.res: ws2_32_test.rc ws2_32_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/ws2_32/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/ws2_32/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/ws2_32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20479,8 +20479,8 @@ dlls/wsock32/libwsock32.$IMPLIBEXT dlls/wsock32/libwsock32.cross.a: tools/widl t
 dlls/wsock32/libwsock32.$IMPLIBEXT dlls/wsock32/libwsock32.cross.a: dlls/wsock32/wsock32.spec dlls/wsock32/Makefile
 	@cd dlls/wsock32 && \$(MAKE) \`basename \$@\`
 dlls/wsock32 dlls/wsock32/__install__ dlls/wsock32/__install-lib__ dlls/wsock32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wsock32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wsock32"
 test "x$enable_wsock32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wsock32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20495,8 +20495,8 @@ dlls/wtsapi32/libwtsapi32.$IMPLIBEXT dlls/wtsapi32/libwtsapi32.cross.a: tools/wi
 dlls/wtsapi32/libwtsapi32.$IMPLIBEXT dlls/wtsapi32/libwtsapi32.cross.a: dlls/wtsapi32/wtsapi32.spec dlls/wtsapi32/Makefile
 	@cd dlls/wtsapi32 && \$(MAKE) \`basename \$@\`
 dlls/wtsapi32 dlls/wtsapi32/__install__ dlls/wtsapi32/__install-lib__ dlls/wtsapi32/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wtsapi32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wtsapi32"
 test "x$enable_wtsapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wtsapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20506,8 +20506,8 @@ ac_config_files="$ac_config_files dlls/wtsapi32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wuapi dlls/wuapi/__install__ dlls/wuapi/__install-lib__ dlls/wuapi/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wuapi/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wuapi"
 test "x$enable_wuapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wuapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20517,8 +20517,8 @@ ac_config_files="$ac_config_files dlls/wuapi/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wuaueng dlls/wuaueng/__install__ dlls/wuaueng/__install-lib__ dlls/wuaueng/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/wuaueng/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/wuaueng"
 test "x$enable_wuaueng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/wuaueng"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20528,8 +20528,8 @@ ac_config_files="$ac_config_files dlls/wuaueng/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xinput1_1 dlls/xinput1_1/__install__ dlls/xinput1_1/__install-lib__ dlls/xinput1_1/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xinput1_1/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xinput1_1"
 test "x$enable_xinput1_1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/xinput1_1"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20539,8 +20539,8 @@ ac_config_files="$ac_config_files dlls/xinput1_1/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xinput1_2 dlls/xinput1_2/__install__ dlls/xinput1_2/__install-lib__ dlls/xinput1_2/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xinput1_2/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xinput1_2"
 test "x$enable_xinput1_2" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/xinput1_2"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20562,8 +20562,8 @@ clean::
 dlls/xinput1_3/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.cross.a: dlls/xinput1_3/xinput1_3.spec dlls/xinput1_3/Makefile
 	@cd dlls/xinput1_3 && \$(MAKE) \`basename \$@\`
 dlls/xinput1_3 dlls/xinput1_3/__install__ dlls/xinput1_3/__install-lib__ dlls/xinput1_3/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xinput1_3/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xinput1_3"
 test "x$enable_xinput1_3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/xinput1_3"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20582,8 +20582,8 @@ xinput1_3_test.exe: \$(TOPOBJDIR)/dlls/xinput1_3/tests/xinput1_3_test.exe$DLLEXT
 xinput1_3_test.rc:
 	echo \"xinput1_3_test.exe TESTRES \\\"xinput1_3_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 xinput1_3_test.res: xinput1_3_test.rc xinput1_3_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xinput1_3/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xinput1_3/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/xinput1_3/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20593,8 +20593,8 @@ ac_config_files="$ac_config_files dlls/xinput1_3/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xinput9_1_0 dlls/xinput9_1_0/__install__ dlls/xinput9_1_0/__install-lib__ dlls/xinput9_1_0/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xinput9_1_0/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xinput9_1_0"
 test "x$enable_xinput9_1_0" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/xinput9_1_0"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20604,8 +20604,8 @@ ac_config_files="$ac_config_files dlls/xinput9_1_0/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xmllite dlls/xmllite/__install__ dlls/xmllite/__install-lib__ dlls/xmllite/__install-dev__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xmllite/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xmllite"
 test "x$enable_xmllite" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dlls/xmllite"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20624,8 +20624,8 @@ xmllite_test.exe: \$(TOPOBJDIR)/dlls/xmllite/tests/xmllite_test.exe$DLLEXT
 xmllite_test.rc:
 	echo \"xmllite_test.exe TESTRES \\\"xmllite_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 xmllite_test.res: xmllite_test.rc xmllite_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	dlls/xmllite/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	dlls/xmllite/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dlls/xmllite/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20633,8 +20633,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/xmllite/tests/Makefile: dlls/xmllite/tests/Makefile.in Maketest.rules config.status"
 ac_config_files="$ac_config_files dlls/xmllite/tests/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	documentation/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	documentation"
 test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	documentation"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20642,8 +20642,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 documentation/Makefile: documentation/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files documentation/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	fonts/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	fonts"
 test "x$enable_fonts" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	fonts"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20651,8 +20651,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 fonts/Makefile: fonts/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files fonts/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	include/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	include"
 test "x$enable_include" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	include"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20660,32 +20660,32 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 include/Makefile: include/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files include/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	libs/port/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	libs/port"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 \$(RECURSE_TARGETS:%=libs/port/%) libs/port: libs/port/Makefile \$(MAKEDEP)
 libs/port/Makefile: libs/port/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files libs/port/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	libs/wine/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	libs/wine"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 \$(RECURSE_TARGETS:%=libs/wine/%) libs/wine: libs/wine/Makefile \$(MAKEDEP)
 libs/wine/Makefile: libs/wine/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files libs/wine/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	libs/wpp/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	libs/wpp"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 \$(RECURSE_TARGETS:%=libs/wpp/%) libs/wpp: libs/wpp/Makefile \$(MAKEDEP)
 libs/wpp/Makefile: libs/wpp/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files libs/wpp/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	loader/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	loader"
 test "x$enable_loader" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	loader"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20693,8 +20693,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 loader/Makefile: loader/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files loader/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs"
 test "x$enable_programs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	programs"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20704,8 +20704,8 @@ ac_config_files="$ac_config_files programs/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/cacls programs/cacls/__install__ programs/cacls/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/cacls/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/cacls"
 test "x$enable_cacls" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/cacls" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/cacls"
@@ -20716,8 +20716,8 @@ ac_config_files="$ac_config_files programs/cacls/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/clock programs/clock/__install__ programs/clock/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/clock/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/clock"
 test "x$enable_clock" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/clock" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/clock"
@@ -20728,8 +20728,8 @@ ac_config_files="$ac_config_files programs/clock/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/cmd programs/cmd/__install__ programs/cmd/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/cmd/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/cmd"
 test "x$enable_cmd" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/cmd" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/cmd"
@@ -20749,8 +20749,8 @@ cmd.exe_test.exe: \$(TOPOBJDIR)/programs/cmd/tests/cmd.exe_test.exe$DLLEXT
 cmd.exe_test.rc:
 	echo \"cmd.exe_test.exe TESTRES \\\"cmd.exe_test.exe\\\"\" >\$@ || (\$(RM) \$@ && false)
 cmd.exe_test.res: cmd.exe_test.rc cmd.exe_test.exe"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/cmd/tests/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/cmd/tests"
 test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	programs/cmd/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20760,8 +20760,8 @@ ac_config_files="$ac_config_files programs/cmd/tests/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/cmdlgtst programs/cmdlgtst/__install__ programs/cmdlgtst/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/cmdlgtst/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/cmdlgtst"
 test "x$enable_cmdlgtst" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/cmdlgtst"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -20771,8 +20771,8 @@ ac_config_files="$ac_config_files programs/cmdlgtst/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/control programs/control/__install__ programs/control/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/control/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/control"
 test "x$enable_control" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/control" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/control"
@@ -20783,8 +20783,8 @@ ac_config_files="$ac_config_files programs/control/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/dxdiag programs/dxdiag/__install__ programs/dxdiag/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/dxdiag/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/dxdiag"
 test "x$enable_dxdiag" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/dxdiag" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/dxdiag"
@@ -20795,8 +20795,8 @@ ac_config_files="$ac_config_files programs/dxdiag/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/eject programs/eject/__install__ programs/eject/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/eject/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/eject"
 test "x$enable_eject" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/eject" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/eject"
@@ -20807,8 +20807,8 @@ ac_config_files="$ac_config_files programs/eject/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/expand programs/expand/__install__ programs/expand/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/expand/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/expand"
 test "x$enable_expand" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/expand" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/expand"
@@ -20819,8 +20819,8 @@ ac_config_files="$ac_config_files programs/expand/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/explorer programs/explorer/__install__ programs/explorer/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/explorer/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/explorer"
 test "x$enable_explorer" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/explorer" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/explorer"
@@ -20831,8 +20831,8 @@ ac_config_files="$ac_config_files programs/explorer/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/extrac32 programs/extrac32/__install__ programs/extrac32/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/extrac32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/extrac32"
 test "x$enable_extrac32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/extrac32" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/extrac32"
@@ -20843,8 +20843,8 @@ ac_config_files="$ac_config_files programs/extrac32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/hh programs/hh/__install__ programs/hh/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/hh/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/hh"
 test "x$enable_hh" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/hh" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/hh"
@@ -20855,8 +20855,8 @@ ac_config_files="$ac_config_files programs/hh/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/icinfo programs/icinfo/__install__ programs/icinfo/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/icinfo/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/icinfo"
 test "x$enable_icinfo" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/icinfo" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/icinfo"
@@ -20867,8 +20867,8 @@ ac_config_files="$ac_config_files programs/icinfo/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/iexplore programs/iexplore/__install__ programs/iexplore/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/iexplore/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/iexplore"
 test "x$enable_iexplore" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/iexplore" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/iexplore"
@@ -20879,8 +20879,8 @@ ac_config_files="$ac_config_files programs/iexplore/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/lodctr programs/lodctr/__install__ programs/lodctr/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/lodctr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/lodctr"
 test "x$enable_lodctr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/lodctr" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/lodctr"
@@ -20891,8 +20891,8 @@ ac_config_files="$ac_config_files programs/lodctr/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/mshta programs/mshta/__install__ programs/mshta/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/mshta/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/mshta"
 test "x$enable_mshta" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/mshta" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/mshta"
@@ -20903,8 +20903,8 @@ ac_config_files="$ac_config_files programs/mshta/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/msiexec programs/msiexec/__install__ programs/msiexec/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/msiexec/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/msiexec"
 test "x$enable_msiexec" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/msiexec" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/msiexec" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -20916,8 +20916,8 @@ ac_config_files="$ac_config_files programs/msiexec/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/net programs/net/__install__ programs/net/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/net/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/net"
 test "x$enable_net" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/net" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/net"
@@ -20928,8 +20928,8 @@ ac_config_files="$ac_config_files programs/net/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/notepad programs/notepad/__install__ programs/notepad/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/notepad/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/notepad"
 test "x$enable_notepad" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/notepad" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/notepad" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -20941,8 +20941,8 @@ ac_config_files="$ac_config_files programs/notepad/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/oleview programs/oleview/__install__ programs/oleview/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/oleview/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/oleview"
 test "x$enable_oleview" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/oleview" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/oleview"
@@ -20953,8 +20953,8 @@ ac_config_files="$ac_config_files programs/oleview/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/progman programs/progman/__install__ programs/progman/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/progman/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/progman"
 test "x$enable_progman" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/progman" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/progman"
@@ -20965,8 +20965,8 @@ ac_config_files="$ac_config_files programs/progman/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/reg programs/reg/__install__ programs/reg/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/reg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/reg"
 test "x$enable_reg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/reg" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/reg"
@@ -20977,8 +20977,8 @@ ac_config_files="$ac_config_files programs/reg/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/regedit programs/regedit/__install__ programs/regedit/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/regedit/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/regedit"
 test "x$enable_regedit" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/regedit" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/regedit" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -20990,8 +20990,8 @@ ac_config_files="$ac_config_files programs/regedit/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/regsvr32 programs/regsvr32/__install__ programs/regsvr32/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/regsvr32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/regsvr32"
 test "x$enable_regsvr32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/regsvr32" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/regsvr32" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21003,8 +21003,8 @@ ac_config_files="$ac_config_files programs/regsvr32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/rpcss programs/rpcss/__install__ programs/rpcss/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/rpcss/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/rpcss"
 test "x$enable_rpcss" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/rpcss" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/rpcss"
@@ -21015,8 +21015,8 @@ ac_config_files="$ac_config_files programs/rpcss/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/rundll32 programs/rundll32/__install__ programs/rundll32/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/rundll32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/rundll32"
 test "x$enable_rundll32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/rundll32" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/rundll32"
@@ -21027,8 +21027,8 @@ ac_config_files="$ac_config_files programs/rundll32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/secedit programs/secedit/__install__ programs/secedit/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/secedit/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/secedit"
 test "x$enable_secedit" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/secedit" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/secedit"
@@ -21039,8 +21039,8 @@ ac_config_files="$ac_config_files programs/secedit/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/services programs/services/__install__ programs/services/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/services/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/services"
 test "x$enable_services" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/services" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/services"
@@ -21051,8 +21051,8 @@ ac_config_files="$ac_config_files programs/services/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/spoolsv programs/spoolsv/__install__ programs/spoolsv/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/spoolsv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/spoolsv"
 test "x$enable_spoolsv" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/spoolsv" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/spoolsv"
@@ -21063,8 +21063,8 @@ ac_config_files="$ac_config_files programs/spoolsv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/start programs/start/__install__ programs/start/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/start/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/start"
 test "x$enable_start" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/start" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/start"
@@ -21075,8 +21075,8 @@ ac_config_files="$ac_config_files programs/start/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/svchost programs/svchost/__install__ programs/svchost/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/svchost/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/svchost"
 test "x$enable_svchost" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/svchost" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/svchost"
@@ -21087,8 +21087,8 @@ ac_config_files="$ac_config_files programs/svchost/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/taskmgr programs/taskmgr/__install__ programs/taskmgr/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/taskmgr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/taskmgr"
 test "x$enable_taskmgr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/taskmgr" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/taskmgr"
@@ -21099,8 +21099,8 @@ ac_config_files="$ac_config_files programs/taskmgr/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/termsv programs/termsv/__install__ programs/termsv/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/termsv/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/termsv"
 test "x$enable_termsv" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/termsv" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/termsv"
@@ -21111,8 +21111,8 @@ ac_config_files="$ac_config_files programs/termsv/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/uninstaller programs/uninstaller/__install__ programs/uninstaller/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/uninstaller/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/uninstaller"
 test "x$enable_uninstaller" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/uninstaller" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/uninstaller"
@@ -21123,8 +21123,8 @@ ac_config_files="$ac_config_files programs/uninstaller/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/unlodctr programs/unlodctr/__install__ programs/unlodctr/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/unlodctr/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/unlodctr"
 test "x$enable_unlodctr" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/unlodctr" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/unlodctr"
@@ -21135,8 +21135,8 @@ ac_config_files="$ac_config_files programs/unlodctr/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/view programs/view/__install__ programs/view/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/view/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/view"
 test "x$enable_view" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/view"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21146,8 +21146,8 @@ ac_config_files="$ac_config_files programs/view/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wineboot programs/wineboot/__install__ programs/wineboot/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/wineboot/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/wineboot"
 test "x$enable_wineboot" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/wineboot" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/wineboot" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21159,8 +21159,8 @@ ac_config_files="$ac_config_files programs/wineboot/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winebrowser programs/winebrowser/__install__ programs/winebrowser/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winebrowser/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winebrowser"
 test "x$enable_winebrowser" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winebrowser" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winebrowser"
@@ -21171,8 +21171,8 @@ ac_config_files="$ac_config_files programs/winebrowser/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winecfg programs/winecfg/__install__ programs/winecfg/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winecfg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winecfg"
 test "x$enable_winecfg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winecfg" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winecfg" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21184,8 +21184,8 @@ ac_config_files="$ac_config_files programs/winecfg/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wineconsole programs/wineconsole/__install__ programs/wineconsole/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/wineconsole/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/wineconsole"
 test "x$enable_wineconsole" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/wineconsole" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/wineconsole" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21197,8 +21197,8 @@ ac_config_files="$ac_config_files programs/wineconsole/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winedbg programs/winedbg/__install__ programs/winedbg/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winedbg/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winedbg"
 test "x$enable_winedbg" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winedbg" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winedbg" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21210,8 +21210,8 @@ ac_config_files="$ac_config_files programs/winedbg/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winedevice programs/winedevice/__install__ programs/winedevice/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winedevice/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winedevice"
 test "x$enable_winedevice" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winedevice" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winedevice"
@@ -21222,8 +21222,8 @@ ac_config_files="$ac_config_files programs/winedevice/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winefile programs/winefile/__install__ programs/winefile/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winefile/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winefile"
 test "x$enable_winefile" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winefile" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winefile" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21235,8 +21235,8 @@ ac_config_files="$ac_config_files programs/winefile/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winemenubuilder programs/winemenubuilder/__install__ programs/winemenubuilder/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winemenubuilder/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winemenubuilder"
 test "x$enable_winemenubuilder" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winemenubuilder" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winemenubuilder"
@@ -21247,8 +21247,8 @@ ac_config_files="$ac_config_files programs/winemenubuilder/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winemine programs/winemine/__install__ programs/winemine/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winemine/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winemine"
 test "x$enable_winemine" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winemine" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winemine" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21260,8 +21260,8 @@ ac_config_files="$ac_config_files programs/winemine/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winepath programs/winepath/__install__ programs/winepath/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winepath/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winepath"
 test "x$enable_winepath" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winepath" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winepath" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\
@@ -21273,8 +21273,8 @@ ac_config_files="$ac_config_files programs/winepath/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winetest programs/winetest/__install__ programs/winetest/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winetest/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winetest"
 test "x$enable_winetest" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winetest"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21284,8 +21284,8 @@ ac_config_files="$ac_config_files programs/winetest/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winevdm programs/winevdm/__install__ programs/winevdm/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winevdm/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winevdm"
 test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winevdm" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winevdm"
@@ -21296,8 +21296,8 @@ ac_config_files="$ac_config_files programs/winevdm/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winhelp.exe16 programs/winhelp.exe16/__install__ programs/winhelp.exe16/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winhelp.exe16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winhelp.exe16"
 test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winhelp.exe16" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winhelp.exe16"
@@ -21308,8 +21308,8 @@ ac_config_files="$ac_config_files programs/winhelp.exe16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winhlp32 programs/winhlp32/__install__ programs/winhlp32/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winhlp32/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winhlp32"
 test "x$enable_winhlp32" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winhlp32" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winhlp32"
@@ -21320,8 +21320,8 @@ ac_config_files="$ac_config_files programs/winhlp32/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winoldap.mod16 programs/winoldap.mod16/__install__ programs/winoldap.mod16/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winoldap.mod16/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winoldap.mod16"
 test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winoldap.mod16" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winoldap.mod16"
@@ -21332,8 +21332,8 @@ ac_config_files="$ac_config_files programs/winoldap.mod16/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/winver programs/winver/__install__ programs/winver/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/winver/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/winver"
 test "x$enable_winver" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/winver" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/winver"
@@ -21344,8 +21344,8 @@ ac_config_files="$ac_config_files programs/winver/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/wordpad programs/wordpad/__install__ programs/wordpad/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/wordpad/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/wordpad"
 test "x$enable_wordpad" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/wordpad" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/wordpad"
@@ -21356,8 +21356,8 @@ ac_config_files="$ac_config_files programs/wordpad/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/write programs/write/__install__ programs/write/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/write/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/write"
 test "x$enable_write" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/write" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/write"
@@ -21368,8 +21368,8 @@ ac_config_files="$ac_config_files programs/write/Makefile"
 
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/xcopy programs/xcopy/__install__ programs/xcopy/__install-lib__: __builddeps__"
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	programs/xcopy/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	programs/xcopy"
 test "x$enable_xcopy" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	programs/xcopy" && ALL_INSTALL_DIRS="$ALL_INSTALL_DIRS \\
 	programs/xcopy"
@@ -21378,8 +21378,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 programs/xcopy/Makefile: programs/xcopy/Makefile.in programs/Makeprog.rules config.status"
 ac_config_files="$ac_config_files programs/xcopy/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	server/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	server"
 test "x$enable_server" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\
 	server"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21387,8 +21387,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 server/Makefile: server/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files server/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21396,8 +21396,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/Makefile: tools/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/widl/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/widl"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/widl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21405,8 +21405,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/widl/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/winebuild/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/winebuild"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/winebuild"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21414,8 +21414,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/winebuild/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/winedump/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/winedump"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/winedump"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21423,8 +21423,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/winedump/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/winegcc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/winegcc"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/winegcc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21432,8 +21432,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/winegcc/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/wmc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/wmc"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/wmc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -21441,8 +21441,8 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status"
 ac_config_files="$ac_config_files tools/wmc/Makefile"
 
-ALL_MAKEFILES="$ALL_MAKEFILES \\
-	tools/wrc/Makefile"
+ALL_DIRS="$ALL_DIRS \\
+	tools/wrc"
 test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\
 	tools/wrc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
diff --git a/configure.ac b/configure.ac
index ed0fa0a191d..ba54bcd9f8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2098,11 +2098,11 @@ Makefile: dummy
 \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])
 
 AC_SUBST(ALL_MAKERULES,"")
-AC_SUBST(ALL_MAKEFILES,"")
 AC_SUBST(ALL_SYMLINKS,"")
 AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
 AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
 
+AC_SUBST(ALL_DIRS,"")
 AC_SUBST(ALL_TOP_DIRS,"")
 AC_SUBST(ALL_DLL_DIRS,"")
 AC_SUBST(ALL_TOOL_DIRS,"")