commit 485cc59c14ba9de6a0b17d3dc4298bc7a1524e11
author Alexandre Julliard <julliard@winehq.org> Mon Aug 25 12:03:35 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 25 12:03:35 2008 +0200
tree 5b9901100261c0a1ba8e2ac9c424e1a6e41e0e60
parent 49163da1d16b8612a7e7dd70d069cadd0b98bd7c

configure: Add possibility to exclude some directories from the generated lists.

configure

diff --git a/configure b/configure
index 4875601..249eb0c 100755
--- a/configure
+++ b/configure
@@ -22254,7 +22254,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/acledit/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_acledit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	acledit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules"
@@ -22262,7 +22262,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/activeds/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_activeds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	activeds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules"
@@ -22270,7 +22270,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/actxprxy/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_actxprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	actxprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules"
@@ -22278,7 +22278,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/adsiid/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_adsiid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	adsiid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules"
@@ -22286,7 +22286,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_advapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	advapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules"
@@ -22294,7 +22294,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advapi32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_advapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	advapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules"
@@ -22302,7 +22302,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advpack/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_advpack" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	advpack"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules"
@@ -22310,7 +22310,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/advpack/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_advpack_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	advpack/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/advpack/tests/Makefile: dlls/advpack/tests/Makefile.in dlls/Maketest.rules"
@@ -22318,7 +22318,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/amstream/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_amstream" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	amstream"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/amstream/Makefile: dlls/amstream/Makefile.in dlls/Makedll.rules"
@@ -22326,7 +22326,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/appwiz.cpl/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_appwiz_cpl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	appwiz.cpl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/appwiz.cpl/Makefile: dlls/appwiz.cpl/Makefile.in dlls/Makedll.rules"
@@ -22334,7 +22334,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/atl/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_atl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	atl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/atl/Makefile: dlls/atl/Makefile.in dlls/Makedll.rules"
@@ -22342,7 +22342,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/avicap32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_avicap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	avicap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/avicap32/Makefile: dlls/avicap32/Makefile.in dlls/Makedll.rules"
@@ -22350,7 +22350,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/avifil32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_avifil32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	avifil32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/avifil32/Makefile: dlls/avifil32/Makefile.in dlls/Makedll.rules"
@@ -22358,7 +22358,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/browseui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_browseui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	browseui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/browseui/Makefile: dlls/browseui/Makefile.in dlls/Makedll.rules"
@@ -22366,7 +22366,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/browseui/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_browseui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	browseui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/browseui/tests/Makefile: dlls/browseui/tests/Makefile.in dlls/Maketest.rules"
@@ -22374,7 +22374,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cabinet/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cabinet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cabinet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cabinet/Makefile: dlls/cabinet/Makefile.in dlls/Makedll.rules"
@@ -22382,7 +22382,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cabinet/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_cabinet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	cabinet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cabinet/tests/Makefile: dlls/cabinet/tests/Makefile.in dlls/Maketest.rules"
@@ -22390,7 +22390,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/capi2032/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_capi2032" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	capi2032"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/capi2032/Makefile: dlls/capi2032/Makefile.in dlls/Makedll.rules"
@@ -22398,7 +22398,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cards/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cards" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cards"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cards/Makefile: dlls/cards/Makefile.in dlls/Makedll.rules"
@@ -22406,7 +22406,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cfgmgr32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cfgmgr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cfgmgr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cfgmgr32/Makefile: dlls/cfgmgr32/Makefile.in dlls/Makedll.rules"
@@ -22414,7 +22414,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/clusapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_clusapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	clusapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/clusapi/Makefile: dlls/clusapi/Makefile.in dlls/Makedll.rules"
@@ -22422,7 +22422,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comcat/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_comcat" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	comcat"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comcat/Makefile: dlls/comcat/Makefile.in dlls/Makedll.rules"
@@ -22430,7 +22430,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comcat/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_comcat_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	comcat/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comcat/tests/Makefile: dlls/comcat/tests/Makefile.in dlls/Maketest.rules"
@@ -22438,7 +22438,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comctl32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_comctl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	comctl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comctl32/Makefile: dlls/comctl32/Makefile.in dlls/Makedll.rules"
@@ -22446,7 +22446,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comctl32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_comctl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	comctl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comctl32/tests/Makefile: dlls/comctl32/tests/Makefile.in dlls/Maketest.rules"
@@ -22454,7 +22454,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comdlg32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_comdlg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	comdlg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comdlg32/Makefile: dlls/comdlg32/Makefile.in dlls/Makedll.rules"
@@ -22462,7 +22462,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comdlg32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_comdlg32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	comdlg32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rules"
@@ -22470,7 +22470,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/compstui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	compstui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/compstui/Makefile: dlls/compstui/Makefile.in dlls/Makedll.rules"
@@ -22478,7 +22478,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/credui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_credui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	credui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/credui/Makefile: dlls/credui/Makefile.in dlls/Makedll.rules"
@@ -22486,7 +22486,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/credui/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_credui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	credui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules"
@@ -22494,7 +22494,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crtdll/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_crtdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	crtdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crtdll/Makefile: dlls/crtdll/Makefile.in dlls/Makedll.rules"
@@ -22502,7 +22502,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crypt32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_crypt32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	crypt32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules"
@@ -22510,7 +22510,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/crypt32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_crypt32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	crypt32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules"
@@ -22518,7 +22518,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptdlg/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cryptdlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cryptdlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules"
@@ -22526,7 +22526,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptdll/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cryptdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cryptdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules"
@@ -22534,7 +22534,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptnet/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cryptnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cryptnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules"
@@ -22542,7 +22542,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptnet/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_cryptnet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	cryptnet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules"
@@ -22550,7 +22550,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/cryptui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_cryptui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	cryptui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/cryptui/Makefile: dlls/cryptui/Makefile.in dlls/Makedll.rules"
@@ -22558,7 +22558,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ctapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ctapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ctapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules"
@@ -22566,7 +22566,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ctl3d32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ctl3d32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ctl3d32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules"
@@ -22574,7 +22574,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d10/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3d10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3d10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules"
@@ -22582,7 +22582,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d8/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3d8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d8/Makefile: dlls/d3d8/Makefile.in dlls/Makedll.rules"
@@ -22590,7 +22590,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d8/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3d8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3d8/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d8/tests/Makefile: dlls/d3d8/tests/Makefile.in dlls/Maketest.rules"
@@ -22598,7 +22598,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d9/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3d9" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3d9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d9/Makefile: dlls/d3d9/Makefile.in dlls/Makedll.rules"
@@ -22606,7 +22606,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3d9/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3d9_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3d9/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3d9/tests/Makefile: dlls/d3d9/tests/Makefile.in dlls/Maketest.rules"
@@ -22614,7 +22614,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dim/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dim" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dim"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dim/Makefile: dlls/d3dim/Makefile.in dlls/Makedll.rules"
@@ -22622,7 +22622,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3drm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3drm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3drm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3drm/Makefile: dlls/d3drm/Makefile.in dlls/Makedll.rules"
@@ -22630,7 +22630,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3drm/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3drm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3drm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3drm/tests/Makefile: dlls/d3drm/tests/Makefile.in dlls/Maketest.rules"
@@ -22638,7 +22638,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx8/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx8/Makefile: dlls/d3dx8/Makefile.in dlls/Makedll.rules"
@@ -22646,7 +22646,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx8/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3dx8_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3dx8/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx8/tests/Makefile: dlls/d3dx8/tests/Makefile.in dlls/Maketest.rules"
@@ -22654,7 +22654,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_24/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_24" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_24"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_24/Makefile: dlls/d3dx9_24/Makefile.in dlls/Makedll.rules"
@@ -22662,7 +22662,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_25/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_25" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_25"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_25/Makefile: dlls/d3dx9_25/Makefile.in dlls/Makedll.rules"
@@ -22670,7 +22670,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_26/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_26" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_26"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_26/Makefile: dlls/d3dx9_26/Makefile.in dlls/Makedll.rules"
@@ -22678,7 +22678,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_27/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_27" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_27"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_27/Makefile: dlls/d3dx9_27/Makefile.in dlls/Makedll.rules"
@@ -22686,7 +22686,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_28/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_28" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_28"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_28/Makefile: dlls/d3dx9_28/Makefile.in dlls/Makedll.rules"
@@ -22694,7 +22694,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_29/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_29" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_29"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_29/Makefile: dlls/d3dx9_29/Makefile.in dlls/Makedll.rules"
@@ -22702,7 +22702,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_30/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_30" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_30"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_30/Makefile: dlls/d3dx9_30/Makefile.in dlls/Makedll.rules"
@@ -22710,7 +22710,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_31/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_31" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_31"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_31/Makefile: dlls/d3dx9_31/Makefile.in dlls/Makedll.rules"
@@ -22718,7 +22718,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_32/Makefile: dlls/d3dx9_32/Makefile.in dlls/Makedll.rules"
@@ -22726,7 +22726,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_33/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_33" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_33"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_33/Makefile: dlls/d3dx9_33/Makefile.in dlls/Makedll.rules"
@@ -22734,7 +22734,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_34/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_34" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_34"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_34/Makefile: dlls/d3dx9_34/Makefile.in dlls/Makedll.rules"
@@ -22742,7 +22742,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_35/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_35" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_35"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_35/Makefile: dlls/d3dx9_35/Makefile.in dlls/Makedll.rules"
@@ -22750,7 +22750,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_36/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_36" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_36"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_36/Makefile: dlls/d3dx9_36/Makefile.in dlls/Makedll.rules"
@@ -22758,7 +22758,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_36/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3dx9_36_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3dx9_36/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_36/tests/Makefile: dlls/d3dx9_36/tests/Makefile.in dlls/Maketest.rules"
@@ -22766,7 +22766,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dx9_37/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dx9_37" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dx9_37"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dx9_37/Makefile: dlls/d3dx9_37/Makefile.in dlls/Makedll.rules"
@@ -22774,7 +22774,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dxof/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_d3dxof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	d3dxof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dxof/Makefile: dlls/d3dxof/Makefile.in dlls/Makedll.rules"
@@ -22782,7 +22782,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/d3dxof/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_d3dxof_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	d3dxof/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/d3dxof/tests/Makefile: dlls/d3dxof/tests/Makefile.in dlls/Maketest.rules"
@@ -22790,7 +22790,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dbghelp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dbghelp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dbghelp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dbghelp/Makefile: dlls/dbghelp/Makefile.in dlls/Makedll.rules"
@@ -22798,7 +22798,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dciman32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dciman32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dciman32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dciman32/Makefile: dlls/dciman32/Makefile.in dlls/Makedll.rules"
@@ -22806,7 +22806,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddraw/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ddraw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ddraw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddraw/Makefile: dlls/ddraw/Makefile.in dlls/Makedll.rules"
@@ -22814,7 +22814,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddraw/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ddraw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ddraw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddraw/tests/Makefile: dlls/ddraw/tests/Makefile.in dlls/Maketest.rules"
@@ -22822,7 +22822,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ddrawex/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ddrawex" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ddrawex"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ddrawex/Makefile: dlls/ddrawex/Makefile.in dlls/Makedll.rules"
@@ -22830,7 +22830,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/devenum/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_devenum" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	devenum"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/devenum/Makefile: dlls/devenum/Makefile.in dlls/Makedll.rules"
@@ -22838,7 +22838,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dinput" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dinput"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput/Makefile: dlls/dinput/Makefile.in dlls/Makedll.rules"
@@ -22846,7 +22846,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_dinput_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dinput/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput/tests/Makefile: dlls/dinput/tests/Makefile.in dlls/Maketest.rules"
@@ -22854,7 +22854,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dinput8/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dinput8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dinput8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dinput8/Makefile: dlls/dinput8/Makefile.in dlls/Makedll.rules"
@@ -22862,7 +22862,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmband/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmband"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmband/Makefile: dlls/dmband/Makefile.in dlls/Makedll.rules"
@@ -22870,7 +22870,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmcompos/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmcompos" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmcompos"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmcompos/Makefile: dlls/dmcompos/Makefile.in dlls/Makedll.rules"
@@ -22878,7 +22878,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmime/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmime" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmime"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmime/Makefile: dlls/dmime/Makefile.in dlls/Makedll.rules"
@@ -22886,7 +22886,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmloader/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmloader" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmloader"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmloader/Makefile: dlls/dmloader/Makefile.in dlls/Makedll.rules"
@@ -22894,7 +22894,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmscript/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmscript/Makefile: dlls/dmscript/Makefile.in dlls/Makedll.rules"
@@ -22902,7 +22902,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmstyle/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmstyle" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmstyle"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmstyle/Makefile: dlls/dmstyle/Makefile.in dlls/Makedll.rules"
@@ -22910,7 +22910,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmsynth/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmsynth" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmsynth"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmsynth/Makefile: dlls/dmsynth/Makefile.in dlls/Makedll.rules"
@@ -22918,7 +22918,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmusic/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmusic" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmusic"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmusic/Makefile: dlls/dmusic/Makefile.in dlls/Makedll.rules"
@@ -22926,7 +22926,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dmusic32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dmusic32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dmusic32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dmusic32/Makefile: dlls/dmusic32/Makefile.in dlls/Makedll.rules"
@@ -22934,7 +22934,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dnsapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dnsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dnsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dnsapi/Makefile: dlls/dnsapi/Makefile.in dlls/Makedll.rules"
@@ -22942,7 +22942,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dnsapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_dnsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dnsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules"
@@ -22950,7 +22950,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplay/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dplay" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dplay"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplay/Makefile: dlls/dplay/Makefile.in dlls/Makedll.rules"
@@ -22958,7 +22958,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplayx/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dplayx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dplayx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplayx/Makefile: dlls/dplayx/Makefile.in dlls/Makedll.rules"
@@ -22966,7 +22966,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dplayx/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_dplayx_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dplayx/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules"
@@ -22974,7 +22974,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnaddr/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dpnaddr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dpnaddr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules"
@@ -22982,7 +22982,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnet/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dpnet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dpnet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules"
@@ -22990,7 +22990,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnhpast/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dpnhpast" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dpnhpast"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules"
@@ -22998,7 +22998,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpnlobby/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dpnlobby" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dpnlobby"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules"
@@ -23006,7 +23006,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dpwsockx/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dpwsockx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dpwsockx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dpwsockx/Makefile: dlls/dpwsockx/Makefile.in dlls/Makedll.rules"
@@ -23014,7 +23014,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dsound/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dsound" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dsound"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules"
@@ -23022,7 +23022,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dsound/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_dsound_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	dsound/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules"
@@ -23030,7 +23030,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dssenh/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dssenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dssenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dssenh/Makefile: dlls/dssenh/Makefile.in dlls/Makedll.rules"
@@ -23038,7 +23038,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dswave/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dswave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dswave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules"
@@ -23046,7 +23046,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dwmapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dwmapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dwmapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dwmapi/Makefile: dlls/dwmapi/Makefile.in dlls/Makedll.rules"
@@ -23054,7 +23054,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxdiagn/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_dxdiagn" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dxdiagn"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules"
@@ -23062,7 +23062,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxerr8/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_dxerr8" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	dxerr8"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules"
@@ -23070,7 +23070,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxerr9/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_dxerr9" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	dxerr9"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules"
@@ -23078,7 +23078,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dxguid/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	dxguid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules"
@@ -23086,7 +23086,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/faultrep/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_faultrep" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	faultrep"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules"
@@ -23094,7 +23094,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/fusion/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_fusion" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	fusion"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fusion/Makefile: dlls/fusion/Makefile.in dlls/Makedll.rules"
@@ -23102,7 +23102,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/fusion/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_fusion_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	fusion/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fusion/tests/Makefile: dlls/fusion/tests/Makefile.in dlls/Maketest.rules"
@@ -23110,7 +23110,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	gdi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules"
@@ -23118,7 +23118,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdi32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_gdi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	gdi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules"
@@ -23126,7 +23126,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdiplus/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_gdiplus" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	gdiplus"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules"
@@ -23134,7 +23134,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdiplus/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_gdiplus_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	gdiplus/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules"
@@ -23142,7 +23142,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/glu32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_glu32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	glu32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules"
@@ -23150,7 +23150,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gphoto2.ds/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_gphoto2_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	gphoto2.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules"
@@ -23158,7 +23158,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gpkcsp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_gpkcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	gpkcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/gpkcsp/Makefile: dlls/gpkcsp/Makefile.in dlls/Makedll.rules"
@@ -23166,7 +23166,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hal/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_hal" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	hal"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules"
@@ -23174,7 +23174,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hhctrl.ocx/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_hhctrl_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	hhctrl.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules"
@@ -23182,7 +23182,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hid/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_hid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	hid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules"
@@ -23190,7 +23190,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hlink/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_hlink" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	hlink"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hlink/Makefile: dlls/hlink/Makefile.in dlls/Makedll.rules"
@@ -23198,7 +23198,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hlink/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_hlink_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	hlink/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hlink/tests/Makefile: dlls/hlink/tests/Makefile.in dlls/Maketest.rules"
@@ -23206,7 +23206,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/hnetcfg/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_hnetcfg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	hnetcfg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/hnetcfg/Makefile: dlls/hnetcfg/Makefile.in dlls/Makedll.rules"
@@ -23214,7 +23214,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iccvid/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_iccvid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	iccvid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iccvid/Makefile: dlls/iccvid/Makefile.in dlls/Makedll.rules"
@@ -23222,7 +23222,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/icmp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_icmp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	icmp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/icmp/Makefile: dlls/icmp/Makefile.in dlls/Makedll.rules"
@@ -23230,7 +23230,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ifsmgr.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ifsmgr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ifsmgr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ifsmgr.vxd/Makefile: dlls/ifsmgr.vxd/Makefile.in dlls/Makedll.rules"
@@ -23238,7 +23238,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imaadp32.acm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_imaadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	imaadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imaadp32.acm/Makefile: dlls/imaadp32.acm/Makefile.in dlls/Makedll.rules"
@@ -23246,7 +23246,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imagehlp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_imagehlp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	imagehlp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules"
@@ -23254,7 +23254,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imm32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_imm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	imm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imm32/Makefile: dlls/imm32/Makefile.in dlls/Makedll.rules"
@@ -23262,7 +23262,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imm32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_imm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	imm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/imm32/tests/Makefile: dlls/imm32/tests/Makefile.in dlls/Maketest.rules"
@@ -23270,7 +23270,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetcomm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_inetcomm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	inetcomm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules"
@@ -23278,7 +23278,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetcomm/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_inetcomm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	inetcomm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules"
@@ -23286,7 +23286,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetmib1/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_inetmib1" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	inetmib1"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetmib1/Makefile: dlls/inetmib1/Makefile.in dlls/Makedll.rules"
@@ -23294,7 +23294,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inetmib1/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_inetmib1_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	inetmib1/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inetmib1/tests/Makefile: dlls/inetmib1/tests/Makefile.in dlls/Maketest.rules"
@@ -23302,7 +23302,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/infosoft/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_infosoft" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	infosoft"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules"
@@ -23310,7 +23310,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/infosoft/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_infosoft_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	infosoft/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules"
@@ -23318,7 +23318,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/initpki/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_initpki" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	initpki"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules"
@@ -23326,7 +23326,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inkobj/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_inkobj" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	inkobj"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules"
@@ -23334,7 +23334,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/inseng/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_inseng" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	inseng"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules"
@@ -23342,7 +23342,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iphlpapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_iphlpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	iphlpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules"
@@ -23350,7 +23350,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/iphlpapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_iphlpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	iphlpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/iphlpapi/tests/Makefile: dlls/iphlpapi/tests/Makefile.in dlls/Maketest.rules"
@@ -23358,7 +23358,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itircl/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_itircl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	itircl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itircl/Makefile: dlls/itircl/Makefile.in dlls/Makedll.rules"
@@ -23366,7 +23366,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itss/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_itss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	itss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itss/Makefile: dlls/itss/Makefile.in dlls/Makedll.rules"
@@ -23374,7 +23374,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/itss/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_itss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	itss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/itss/tests/Makefile: dlls/itss/tests/Makefile.in dlls/Maketest.rules"
@@ -23382,7 +23382,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/jscript/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_jscript" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	jscript"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/jscript/Makefile: dlls/jscript/Makefile.in dlls/Makedll.rules"
@@ -23390,7 +23390,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/jscript/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_jscript_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	jscript/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/jscript/tests/Makefile: dlls/jscript/tests/Makefile.in dlls/Maketest.rules"
@@ -23398,7 +23398,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/kernel32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_kernel32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	kernel32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules"
@@ -23406,7 +23406,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/kernel32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_kernel32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	kernel32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules"
@@ -23414,7 +23414,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localspl/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_localspl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	localspl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules"
@@ -23422,7 +23422,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localspl/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_localspl_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	localspl/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules"
@@ -23430,7 +23430,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_localui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	localui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localui/Makefile: dlls/localui/Makefile.in dlls/Makedll.rules"
@@ -23438,7 +23438,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/localui/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_localui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	localui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/localui/tests/Makefile: dlls/localui/tests/Makefile.in dlls/Maketest.rules"
@@ -23446,7 +23446,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/lz32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_lz32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	lz32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lz32/Makefile: dlls/lz32/Makefile.in dlls/Makedll.rules"
@@ -23454,7 +23454,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/lz32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_lz32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	lz32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules"
@@ -23462,7 +23462,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mapi32/Makefile: dlls/mapi32/Makefile.in dlls/Makedll.rules"
@@ -23470,7 +23470,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mapi32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_mapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	mapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mapi32/tests/Makefile: dlls/mapi32/tests/Makefile.in dlls/Maketest.rules"
@@ -23478,7 +23478,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciavi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mciavi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mciavi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciavi32/Makefile: dlls/mciavi32/Makefile.in dlls/Makedll.rules"
@@ -23486,7 +23486,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mcicda/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mcicda" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mcicda"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mcicda/Makefile: dlls/mcicda/Makefile.in dlls/Makedll.rules"
@@ -23494,7 +23494,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciseq/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mciseq" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mciseq"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciseq/Makefile: dlls/mciseq/Makefile.in dlls/Makedll.rules"
@@ -23502,7 +23502,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mciwave/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mciwave" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mciwave"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mciwave/Makefile: dlls/mciwave/Makefile.in dlls/Makedll.rules"
@@ -23510,7 +23510,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/midimap/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_midimap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	midimap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/midimap/Makefile: dlls/midimap/Makefile.in dlls/Makedll.rules"
@@ -23518,7 +23518,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mlang/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mlang" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mlang"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mlang/Makefile: dlls/mlang/Makefile.in dlls/Makedll.rules"
@@ -23526,7 +23526,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mlang/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_mlang_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	mlang/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules"
@@ -23534,7 +23534,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mmdevldr.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mmdevldr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mmdevldr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules"
@@ -23542,7 +23542,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/monodebg.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_monodebg_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	monodebg.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules"
@@ -23550,7 +23550,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mountmgr.sys/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mountmgr_sys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mountmgr.sys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules"
@@ -23558,7 +23558,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mpr/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mpr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mpr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mpr/Makefile: dlls/mpr/Makefile.in dlls/Makedll.rules"
@@ -23566,7 +23566,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mprapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mprapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mprapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules"
@@ -23574,7 +23574,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msacm32_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msacm32.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32.drv/Makefile: dlls/msacm32.drv/Makefile.in dlls/Makedll.rules"
@@ -23582,7 +23582,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msacm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msacm32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32/Makefile: dlls/msacm32/Makefile.in dlls/Makedll.rules"
@@ -23590,7 +23590,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_msacm32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	msacm32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm32/tests/Makefile: dlls/msacm32/tests/Makefile.in dlls/Maketest.rules"
@@ -23598,7 +23598,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msadp32.acm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msadp32_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msadp32.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msadp32.acm/Makefile: dlls/msadp32.acm/Makefile.in dlls/Makedll.rules"
@@ -23606,7 +23606,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscat32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mscat32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mscat32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscat32/Makefile: dlls/mscat32/Makefile.in dlls/Makedll.rules"
@@ -23614,7 +23614,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscms/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mscms" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mscms"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscms/Makefile: dlls/mscms/Makefile.in dlls/Makedll.rules"
@@ -23622,7 +23622,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscms/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_mscms_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	mscms/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscms/tests/Makefile: dlls/mscms/tests/Makefile.in dlls/Maketest.rules"
@@ -23630,7 +23630,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mscoree/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mscoree" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mscoree"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mscoree/Makefile: dlls/mscoree/Makefile.in dlls/Makedll.rules"
@@ -23638,7 +23638,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msdmo/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msdmo" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msdmo"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msdmo/Makefile: dlls/msdmo/Makefile.in dlls/Makedll.rules"
@@ -23646,7 +23646,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msftedit/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msftedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msftedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msftedit/Makefile: dlls/msftedit/Makefile.in dlls/Makedll.rules"
@@ -23654,7 +23654,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msg711.acm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msg711_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msg711.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msg711.acm/Makefile: dlls/msg711.acm/Makefile.in dlls/Makedll.rules"
@@ -23662,7 +23662,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml.tlb/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mshtml_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mshtml.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml.tlb/Makefile: dlls/mshtml.tlb/Makefile.in dlls/Makedll.rules"
@@ -23670,7 +23670,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mshtml" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mshtml"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml/Makefile: dlls/mshtml/Makefile.in dlls/Makedll.rules"
@@ -23678,7 +23678,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mshtml/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_mshtml_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	mshtml/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules"
@@ -23686,7 +23686,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules"
@@ -23694,7 +23694,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_msi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	msi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules"
@@ -23702,7 +23702,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msimg32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msimg32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msimg32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msimg32/Makefile: dlls/msimg32/Makefile.in dlls/Makedll.rules"
@@ -23710,7 +23710,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msimtf/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msimtf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msimtf"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules"
@@ -23718,7 +23718,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msisip/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msisip" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msisip"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisip/Makefile: dlls/msisip/Makefile.in dlls/Makedll.rules"
@@ -23726,7 +23726,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msisys.ocx/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msisys_ocx" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msisys.ocx"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules"
@@ -23734,7 +23734,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msnet32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msnet32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msnet32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules"
@@ -23742,7 +23742,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msrle32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msrle32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msrle32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules"
@@ -23750,7 +23750,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mssip32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mssip32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mssip32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules"
@@ -23758,7 +23758,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mstask/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mstask" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mstask"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mstask/Makefile: dlls/mstask/Makefile.in dlls/Makedll.rules"
@@ -23766,7 +23766,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mstask/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_mstask_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	mstask/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mstask/tests/Makefile: dlls/mstask/tests/Makefile.in dlls/Maketest.rules"
@@ -23774,7 +23774,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcirt/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcirt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcirt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules"
@@ -23782,7 +23782,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcr71/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcr71" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcr71"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules"
@@ -23790,7 +23790,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcrt" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcrt"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules"
@@ -23798,7 +23798,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_msvcrt_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	msvcrt/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt/tests/Makefile: dlls/msvcrt/tests/Makefile.in dlls/Maketest.rules"
@@ -23806,7 +23806,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt20/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcrt20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcrt20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt20/Makefile: dlls/msvcrt20/Makefile.in dlls/Makedll.rules"
@@ -23814,7 +23814,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrt40/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcrt40" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcrt40"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrt40/Makefile: dlls/msvcrt40/Makefile.in dlls/Makedll.rules"
@@ -23822,7 +23822,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrtd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvcrtd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvcrtd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrtd/Makefile: dlls/msvcrtd/Makefile.in dlls/Makedll.rules"
@@ -23830,7 +23830,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvcrtd/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_msvcrtd_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	msvcrtd/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvcrtd/tests/Makefile: dlls/msvcrtd/tests/Makefile.in dlls/Maketest.rules"
@@ -23838,7 +23838,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvfw32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvfw32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvfw32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvfw32/Makefile: dlls/msvfw32/Makefile.in dlls/Makedll.rules"
@@ -23846,7 +23846,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msvidc32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msvidc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msvidc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msvidc32/Makefile: dlls/msvidc32/Makefile.in dlls/Makedll.rules"
@@ -23854,7 +23854,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mswsock/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_mswsock" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mswsock"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mswsock/Makefile: dlls/mswsock/Makefile.in dlls/Makedll.rules"
@@ -23862,7 +23862,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msxml3/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_msxml3" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msxml3"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml3/Makefile: dlls/msxml3/Makefile.in dlls/Makedll.rules"
@@ -23870,7 +23870,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msxml3/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_msxml3_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	msxml3/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msxml3/tests/Makefile: dlls/msxml3/tests/Makefile.in dlls/Maketest.rules"
@@ -23878,7 +23878,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/nddeapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_nddeapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	nddeapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/nddeapi/Makefile: dlls/nddeapi/Makefile.in dlls/Makedll.rules"
@@ -23886,7 +23886,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/netapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_netapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	netapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/netapi32/Makefile: dlls/netapi32/Makefile.in dlls/Makedll.rules"
@@ -23894,7 +23894,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/netapi32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_netapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	netapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/netapi32/tests/Makefile: dlls/netapi32/tests/Makefile.in dlls/Maketest.rules"
@@ -23902,7 +23902,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/newdev/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_newdev" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	newdev"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/newdev/Makefile: dlls/newdev/Makefile.in dlls/Makedll.rules"
@@ -23910,7 +23910,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdll/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ntdll" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ntdll"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdll/Makefile: dlls/ntdll/Makefile.in dlls/Makedll.rules"
@@ -23918,7 +23918,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdll/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ntdll_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ntdll/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules"
@@ -23926,7 +23926,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdsapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ntdsapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ntdsapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdsapi/Makefile: dlls/ntdsapi/Makefile.in dlls/Makedll.rules"
@@ -23934,7 +23934,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntdsapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ntdsapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ntdsapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntdsapi/tests/Makefile: dlls/ntdsapi/tests/Makefile.in dlls/Maketest.rules"
@@ -23942,7 +23942,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntoskrnl.exe/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ntoskrnl_exe" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ntoskrnl.exe"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntoskrnl.exe/Makefile: dlls/ntoskrnl.exe/Makefile.in dlls/Makedll.rules"
@@ -23950,7 +23950,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntprint/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ntprint" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ntprint"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntprint/Makefile: dlls/ntprint/Makefile.in dlls/Makedll.rules"
@@ -23958,7 +23958,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ntprint/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ntprint_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ntprint/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ntprint/tests/Makefile: dlls/ntprint/tests/Makefile.in dlls/Maketest.rules"
@@ -23966,7 +23966,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/objsel/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_objsel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	objsel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/objsel/Makefile: dlls/objsel/Makefile.in dlls/Makedll.rules"
@@ -23974,7 +23974,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbc32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_odbc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	odbc32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbc32/Makefile: dlls/odbc32/Makefile.in dlls/Makedll.rules"
@@ -23982,7 +23982,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbccp32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_odbccp32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	odbccp32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbccp32/Makefile: dlls/odbccp32/Makefile.in dlls/Makedll.rules"
@@ -23990,7 +23990,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/odbccp32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_odbccp32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	odbccp32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/odbccp32/tests/Makefile: dlls/odbccp32/tests/Makefile.in dlls/Maketest.rules"
@@ -23998,7 +23998,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ole32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole32/Makefile: dlls/ole32/Makefile.in dlls/Makedll.rules"
@@ -24006,7 +24006,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ole32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ole32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole32/tests/Makefile: dlls/ole32/tests/Makefile.in dlls/Maketest.rules"
@@ -24014,7 +24014,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleacc/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_oleacc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	oleacc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleacc/Makefile: dlls/oleacc/Makefile.in dlls/Makedll.rules"
@@ -24022,7 +24022,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleaut32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_oleaut32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	oleaut32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleaut32/Makefile: dlls/oleaut32/Makefile.in dlls/Makedll.rules"
@@ -24030,7 +24030,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oleaut32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_oleaut32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	oleaut32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oleaut32/tests/Makefile: dlls/oleaut32/tests/Makefile.in dlls/Maketest.rules"
@@ -24038,7 +24038,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olecli32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_olecli32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olecli32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olecli32/Makefile: dlls/olecli32/Makefile.in dlls/Makedll.rules"
@@ -24046,7 +24046,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/oledlg/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_oledlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	oledlg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/oledlg/Makefile: dlls/oledlg/Makefile.in dlls/Makedll.rules"
@@ -24054,7 +24054,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olepro32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_olepro32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olepro32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olepro32/Makefile: dlls/olepro32/Makefile.in dlls/Makedll.rules"
@@ -24062,7 +24062,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olesvr32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_olesvr32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olesvr32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules"
@@ -24070,7 +24070,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olethk32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_olethk32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olethk32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olethk32/Makefile: dlls/olethk32/Makefile.in dlls/Makedll.rules"
@@ -24078,7 +24078,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/opengl32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_opengl32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	opengl32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules"
@@ -24086,7 +24086,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/opengl32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_opengl32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	opengl32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/opengl32/tests/Makefile: dlls/opengl32/tests/Makefile.in dlls/Maketest.rules"
@@ -24094,7 +24094,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pdh/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_pdh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	pdh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules"
@@ -24102,7 +24102,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pdh/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_pdh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	pdh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pdh/tests/Makefile: dlls/pdh/tests/Makefile.in dlls/Maketest.rules"
@@ -24110,7 +24110,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/powrprof/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_powrprof" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	powrprof"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/powrprof/Makefile: dlls/powrprof/Makefile.in dlls/Makedll.rules"
@@ -24118,7 +24118,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/printui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_printui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	printui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/printui/Makefile: dlls/printui/Makefile.in dlls/Makedll.rules"
@@ -24126,7 +24126,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/propsys/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_propsys" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	propsys"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/propsys/Makefile: dlls/propsys/Makefile.in dlls/Makedll.rules"
@@ -24134,7 +24134,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/psapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_psapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	psapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules"
@@ -24142,7 +24142,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/psapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_psapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	psapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules"
@@ -24150,7 +24150,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/pstorec/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_pstorec" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	pstorec"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules"
@@ -24158,7 +24158,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qcap/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_qcap" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	qcap"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules"
@@ -24166,7 +24166,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qedit/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_qedit" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	qedit"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules"
@@ -24174,7 +24174,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qedit/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_qedit_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	qedit/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules"
@@ -24182,7 +24182,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgr/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_qmgr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	qmgr"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules"
@@ -24190,7 +24190,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgr/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_qmgr_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	qmgr/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgr/tests/Makefile: dlls/qmgr/tests/Makefile.in dlls/Maketest.rules"
@@ -24198,7 +24198,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/qmgrprxy/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_qmgrprxy" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	qmgrprxy"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules"
@@ -24206,7 +24206,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/quartz/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_quartz" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	quartz"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules"
@@ -24214,7 +24214,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/quartz/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_quartz_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	quartz/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules"
@@ -24222,7 +24222,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/query/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_query" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	query"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules"
@@ -24230,7 +24230,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rasapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_rasapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	rasapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rasapi32/Makefile: dlls/rasapi32/Makefile.in dlls/Makedll.rules"
@@ -24238,7 +24238,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rasapi32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_rasapi32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	rasapi32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rules"
@@ -24246,7 +24246,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/resutils/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_resutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	resutils"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/resutils/Makefile: dlls/resutils/Makefile.in dlls/Makedll.rules"
@@ -24254,7 +24254,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched20/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_riched20" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	riched20"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched20/Makefile: dlls/riched20/Makefile.in dlls/Makedll.rules"
@@ -24262,7 +24262,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched20/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_riched20_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	riched20/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched20/tests/Makefile: dlls/riched20/tests/Makefile.in dlls/Maketest.rules"
@@ -24270,7 +24270,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_riched32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	riched32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched32/Makefile: dlls/riched32/Makefile.in dlls/Makedll.rules"
@@ -24278,7 +24278,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/riched32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_riched32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	riched32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rules"
@@ -24286,7 +24286,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rpcrt4/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_rpcrt4" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	rpcrt4"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules"
@@ -24294,7 +24294,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rpcrt4/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_rpcrt4_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	rpcrt4/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules"
@@ -24302,7 +24302,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsabase/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_rsabase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	rsabase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules"
@@ -24310,7 +24310,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsaenh/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_rsaenh" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	rsaenh"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules"
@@ -24318,7 +24318,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rsaenh/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_rsaenh_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	rsaenh/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules"
@@ -24326,7 +24326,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sane.ds/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sane_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sane.ds"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules"
@@ -24334,7 +24334,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sccbase/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sccbase" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sccbase"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sccbase/Makefile: dlls/sccbase/Makefile.in dlls/Makedll.rules"
@@ -24342,7 +24342,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/schannel/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_schannel" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	schannel"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/schannel/Makefile: dlls/schannel/Makefile.in dlls/Makedll.rules"
@@ -24350,7 +24350,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/schannel/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_schannel_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	schannel/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/schannel/tests/Makefile: dlls/schannel/tests/Makefile.in dlls/Maketest.rules"
@@ -24358,7 +24358,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/secur32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_secur32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	secur32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/secur32/Makefile: dlls/secur32/Makefile.in dlls/Makedll.rules"
@@ -24366,7 +24366,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/secur32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_secur32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	secur32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules"
@@ -24374,7 +24374,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/security/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_security" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	security"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/security/Makefile: dlls/security/Makefile.in dlls/Makedll.rules"
@@ -24382,7 +24382,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sensapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sensapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sensapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sensapi/Makefile: dlls/sensapi/Makefile.in dlls/Makedll.rules"
@@ -24390,7 +24390,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/serialui/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_serialui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	serialui"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/serialui/Makefile: dlls/serialui/Makefile.in dlls/Makedll.rules"
@@ -24398,7 +24398,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/serialui/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_serialui_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	serialui/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/serialui/tests/Makefile: dlls/serialui/tests/Makefile.in dlls/Maketest.rules"
@@ -24406,7 +24406,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/setupapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_setupapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	setupapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/setupapi/Makefile: dlls/setupapi/Makefile.in dlls/Makedll.rules"
@@ -24414,7 +24414,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/setupapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_setupapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	setupapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/setupapi/tests/Makefile: dlls/setupapi/tests/Makefile.in dlls/Maketest.rules"
@@ -24422,7 +24422,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sfc/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sfc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sfc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sfc/Makefile: dlls/sfc/Makefile.in dlls/Makedll.rules"
@@ -24430,7 +24430,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sfc_os/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sfc_os" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sfc_os"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sfc_os/Makefile: dlls/sfc_os/Makefile.in dlls/Makedll.rules"
@@ -24438,7 +24438,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdoclc/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_shdoclc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	shdoclc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdoclc/Makefile: dlls/shdoclc/Makefile.in dlls/Makedll.rules"
@@ -24446,7 +24446,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdocvw/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_shdocvw" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	shdocvw"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdocvw/Makefile: dlls/shdocvw/Makefile.in dlls/Makedll.rules"
@@ -24454,7 +24454,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shdocvw/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_shdocvw_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	shdocvw/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules"
@@ -24462,7 +24462,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shell32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_shell32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	shell32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shell32/Makefile: dlls/shell32/Makefile.in dlls/Makedll.rules"
@@ -24470,7 +24470,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shell32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_shell32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	shell32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shell32/tests/Makefile: dlls/shell32/tests/Makefile.in dlls/Maketest.rules"
@@ -24478,7 +24478,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shfolder/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_shfolder" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	shfolder"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shfolder/Makefile: dlls/shfolder/Makefile.in dlls/Makedll.rules"
@@ -24486,7 +24486,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shlwapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_shlwapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	shlwapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shlwapi/Makefile: dlls/shlwapi/Makefile.in dlls/Makedll.rules"
@@ -24494,7 +24494,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/shlwapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_shlwapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	shlwapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules"
@@ -24502,7 +24502,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/slbcsp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_slbcsp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	slbcsp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules"
@@ -24510,7 +24510,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/slc/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_slc" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	slc"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/slc/Makefile: dlls/slc/Makefile.in dlls/Makedll.rules"
@@ -24518,7 +24518,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/snmpapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_snmpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	snmpapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules"
@@ -24526,7 +24526,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/snmpapi/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_snmpapi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	snmpapi/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules"
@@ -24534,7 +24534,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/softpub/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_softpub" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	softpub"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules"
@@ -24542,7 +24542,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/spoolss/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	spoolss"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules"
@@ -24550,7 +24550,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/spoolss/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_spoolss_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	spoolss/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules"
@@ -24558,7 +24558,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/stdole2.tlb/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_stdole2_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	stdole2.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole2.tlb/Makefile: dlls/stdole2.tlb/Makefile.in dlls/Makedll.rules"
@@ -24566,7 +24566,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/stdole32.tlb/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_stdole32_tlb" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	stdole32.tlb"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules"
@@ -24574,7 +24574,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sti/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sti" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sti"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules"
@@ -24582,7 +24582,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/strmiids/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	strmiids"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules"
@@ -24590,7 +24590,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/svrapi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_svrapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	svrapi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules"
@@ -24598,7 +24598,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/sxs/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_sxs" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	sxs"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules"
@@ -24606,7 +24606,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/tapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_tapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	tapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules"
@@ -24614,7 +24614,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/twain_32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_twain_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	twain_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules"
@@ -24622,7 +24622,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/unicows/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	unicows"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules"
@@ -24630,7 +24630,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/url/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_url" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	url"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/url/Makefile: dlls/url/Makefile.in dlls/Makedll.rules"
@@ -24638,7 +24638,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/urlmon/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_urlmon" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	urlmon"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/urlmon/Makefile: dlls/urlmon/Makefile.in dlls/Makedll.rules"
@@ -24646,7 +24646,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/urlmon/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_urlmon_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	urlmon/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules"
@@ -24654,7 +24654,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/user32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_user32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	user32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules"
@@ -24662,7 +24662,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/user32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_user32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	user32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules"
@@ -24670,7 +24670,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/userenv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_userenv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	userenv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules"
@@ -24678,7 +24678,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/userenv/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_userenv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	userenv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/userenv/tests/Makefile: dlls/userenv/tests/Makefile.in dlls/Maketest.rules"
@@ -24686,7 +24686,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/usp10/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_usp10" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	usp10"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules"
@@ -24694,7 +24694,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/usp10/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_usp10_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	usp10/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules"
@@ -24702,7 +24702,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uuid/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_uuid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	uuid"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uuid/Makefile: dlls/uuid/Makefile.in dlls/Makeimplib.rules"
@@ -24710,7 +24710,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uxtheme/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_uxtheme" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	uxtheme"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uxtheme/Makefile: dlls/uxtheme/Makefile.in dlls/Makedll.rules"
@@ -24718,7 +24718,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/uxtheme/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_uxtheme_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	uxtheme/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/uxtheme/tests/Makefile: dlls/uxtheme/tests/Makefile.in dlls/Maketest.rules"
@@ -24726,7 +24726,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vdhcp.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vdhcp_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vdhcp.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdhcp.vxd/Makefile: dlls/vdhcp.vxd/Makefile.in dlls/Makedll.rules"
@@ -24734,7 +24734,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vdmdbg/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vdmdbg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vdmdbg"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdmdbg/Makefile: dlls/vdmdbg/Makefile.in dlls/Makedll.rules"
@@ -24742,7 +24742,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/version/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_version" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	version"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/version/Makefile: dlls/version/Makefile.in dlls/Makedll.rules"
@@ -24750,7 +24750,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/version/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_version_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	version/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/version/tests/Makefile: dlls/version/tests/Makefile.in dlls/Maketest.rules"
@@ -24758,7 +24758,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vmm.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vmm_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vmm.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vmm.vxd/Makefile: dlls/vmm.vxd/Makefile.in dlls/Makedll.rules"
@@ -24766,7 +24766,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnbt.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vnbt_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vnbt.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnbt.vxd/Makefile: dlls/vnbt.vxd/Makefile.in dlls/Makedll.rules"
@@ -24774,7 +24774,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnetbios.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vnetbios_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vnetbios.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnetbios.vxd/Makefile: dlls/vnetbios.vxd/Makefile.in dlls/Makedll.rules"
@@ -24782,7 +24782,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vtdapi.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vtdapi_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vtdapi.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vtdapi.vxd/Makefile: dlls/vtdapi.vxd/Makefile.in dlls/Makedll.rules"
@@ -24790,7 +24790,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vwin32.vxd/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_vwin32_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vwin32.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vwin32.vxd/Makefile: dlls/vwin32.vxd/Makefile.in dlls/Makedll.rules"
@@ -24798,7 +24798,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/w32skrnl/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_w32skrnl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	w32skrnl"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules"
@@ -24806,7 +24806,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winealsa.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winealsa_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winealsa.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winealsa.drv/Makefile: dlls/winealsa.drv/Makefile.in dlls/Makedll.rules"
@@ -24814,7 +24814,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineaudioio.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wineaudioio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wineaudioio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineaudioio.drv/Makefile: dlls/wineaudioio.drv/Makefile.in dlls/Makedll.rules"
@@ -24822,7 +24822,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winecoreaudio.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winecoreaudio_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winecoreaudio.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winecoreaudio.drv/Makefile: dlls/winecoreaudio.drv/Makefile.in dlls/Makedll.rules"
@@ -24830,7 +24830,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winecrt0/Makefile"
-ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
+test "x$enable_winecrt0" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
 	winecrt0"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winecrt0/Makefile: dlls/winecrt0/Makefile.in dlls/Makeimplib.rules"
@@ -24838,7 +24838,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wined3d/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wined3d" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wined3d"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wined3d/Makefile: dlls/wined3d/Makefile.in dlls/Makedll.rules"
@@ -24846,7 +24846,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winedos/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winedos" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winedos"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winedos/Makefile: dlls/winedos/Makefile.in dlls/Makedll.rules"
@@ -24854,7 +24854,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineesd.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wineesd_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wineesd.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineesd.drv/Makefile: dlls/wineesd.drv/Makefile.in dlls/Makedll.rules"
@@ -24862,7 +24862,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winejack.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winejack_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winejack.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejack.drv/Makefile: dlls/winejack.drv/Makefile.in dlls/Makedll.rules"
@@ -24870,7 +24870,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winejoystick.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winejoystick_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winejoystick.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules"
@@ -24878,7 +24878,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winemp3.acm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winemp3_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winemp3.acm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules"
@@ -24886,7 +24886,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winenas.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winenas_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winenas.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winenas.drv/Makefile: dlls/winenas.drv/Makefile.in dlls/Makedll.rules"
@@ -24894,7 +24894,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineoss.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wineoss_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wineoss.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineoss.drv/Makefile: dlls/wineoss.drv/Makefile.in dlls/Makedll.rules"
@@ -24902,7 +24902,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wineps.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wineps_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wineps.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile.in dlls/Makedll.rules"
@@ -24910,7 +24910,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winequartz.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winequartz_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winequartz.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules"
@@ -24918,7 +24918,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winex11.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winex11_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winex11.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules"
@@ -24926,7 +24926,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wing32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wing32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wing32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules"
@@ -24934,7 +24934,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winhttp/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winhttp" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winhttp"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules"
@@ -24942,7 +24942,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winhttp/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_winhttp_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	winhttp/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules"
@@ -24950,7 +24950,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wininet/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wininet" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wininet"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules"
@@ -24958,7 +24958,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wininet/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_wininet_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	wininet/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules"
@@ -24966,7 +24966,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winmm/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winmm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winmm"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules"
@@ -24974,7 +24974,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winmm/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_winmm_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	winmm/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules"
@@ -24982,7 +24982,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winnls32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winnls32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winnls32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules"
@@ -24990,7 +24990,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winscard/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winscard" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winscard"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules"
@@ -24998,7 +24998,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winspool.drv/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_winspool_drv" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	winspool.drv"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules"
@@ -25006,7 +25006,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winspool.drv/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_winspool_drv_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	winspool.drv/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules"
@@ -25014,7 +25014,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintab32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wintab32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wintab32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules"
@@ -25022,7 +25022,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintrust/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wintrust" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wintrust"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintrust/Makefile: dlls/wintrust/Makefile.in dlls/Makedll.rules"
@@ -25030,7 +25030,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintrust/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_wintrust_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	wintrust/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wintrust/tests/Makefile: dlls/wintrust/tests/Makefile.in dlls/Maketest.rules"
@@ -25038,7 +25038,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wldap32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wldap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wldap32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wldap32/Makefile: dlls/wldap32/Makefile.in dlls/Makedll.rules"
@@ -25046,7 +25046,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wmi/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wmi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wmi"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wmi/Makefile: dlls/wmi/Makefile.in dlls/Makedll.rules"
@@ -25054,7 +25054,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wnaspi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wnaspi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wnaspi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wnaspi32/Makefile: dlls/wnaspi32/Makefile.in dlls/Makedll.rules"
@@ -25062,7 +25062,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wow32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wow32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wow32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wow32/Makefile: dlls/wow32/Makefile.in dlls/Makedll.rules"
@@ -25070,7 +25070,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ws2_32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_ws2_32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ws2_32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ws2_32/Makefile: dlls/ws2_32/Makefile.in dlls/Makedll.rules"
@@ -25078,7 +25078,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ws2_32/tests/Makefile"
-ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+test "x$enable_ws2_32_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
 	ws2_32/tests"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ws2_32/tests/Makefile: dlls/ws2_32/tests/Makefile.in dlls/Maketest.rules"
@@ -25086,7 +25086,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wsock32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wsock32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wsock32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wsock32/Makefile: dlls/wsock32/Makefile.in dlls/Makedll.rules"
@@ -25094,7 +25094,7 @@
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wtsapi32/Makefile"
-ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_wtsapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	wtsapi32"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/wtsapi32/Makefile: dlls/wtsapi32/Makefile.in dlls/Makedll.rules"