configure: Generate the dlls directory lists in configure instead of make_makefiles.

aclocal.m4

@@ -168,12 +168,14 @@ AC_CONFIG_FILES([$1])])
 
 dnl **** Create a makefile from config.status ****
 dnl
-dnl Usage: WINE_CONFIG_MAKEFILE(file,deps)
+dnl Usage: WINE_CONFIG_MAKEFILE(file,deps,prefix,var)
 dnl
 AC_DEFUN([WINE_CONFIG_MAKEFILE],
-[m4_pushdef([ac_dir],m4_bpatsubst([$1],[/?Makefile$],[]))dnl
+[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^\($3/?\(.*\)/\)?Makefile$],[\2]))dnl
 m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\
 	$1"])
+m4_ifval([$4],[$4="$[$4] \\
+	ac_dir"])
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 [$1: ]m4_ifval([$2],[$1.in $2],[$1.in])"
 AC_CONFIG_FILES([$1])dnl

dlls/Makefile.in

@@ -7,6 +7,11 @@ VPATH     = @srcdir@
 
 INSTALLDIRS = $(DESTDIR)$(dlldir)
 
+DLLSUBDIRS    = @ALL_DLL_DIRS@
+IMPLIBSUBDIRS = @ALL_IMPLIB_DIRS@
+TESTSUBDIRS   = @ALL_TEST_DIRS@
+SUBDIRS       = $(DLLSUBDIRS) $(IMPLIBSUBDIRS) $(TESTSUBDIRS)
+
 # special configure-dependent targets
 
 GLU32FILES = glu32
@@ -279,111 +284,6 @@ BASEDIRS = \
 	wsock32 \
 	wtsapi32
 
-IMPLIBSUBDIRS = \
-	adsiid \
-	dxerr8 \
-	dxerr9 \
-	dxguid \
-	strmiids \
-	uuid \
-	winecrt0
-
-TESTSUBDIRS = \
-	advapi32/tests \
-	advpack/tests \
-	browseui/tests \
-	cabinet/tests \
-	comcat/tests \
-	comctl32/tests \
-	comdlg32/tests \
-	credui/tests \
-	crypt32/tests \
-	cryptnet/tests \
-	d3d8/tests \
-	d3d9/tests \
-	d3drm/tests \
-	d3dx8/tests \
-	d3dx9_36/tests \
-	d3dxof/tests \
-	ddraw/tests \
-	dinput/tests \
-	dnsapi/tests \
-	dplayx/tests \
-	dsound/tests \
-	fusion/tests \
-	gdi32/tests \
-	gdiplus/tests \
-	hlink/tests \
-	imm32/tests \
-	inetcomm/tests \
-	inetmib1/tests \
-	infosoft/tests \
-	iphlpapi/tests \
-	itss/tests \
-	jscript/tests \
-	kernel32/tests \
-	localspl/tests \
-	localui/tests \
-	lz32/tests \
-	mapi32/tests \
-	mlang/tests \
-	msacm32/tests \
-	mscms/tests \
-	mshtml/tests \
-	msi/tests \
-	mstask/tests \
-	msvcrt/tests \
-	msvcrtd/tests \
-	msxml3/tests \
-	netapi32/tests \
-	ntdll/tests \
-	ntdsapi/tests \
-	ntprint/tests \
-	odbccp32/tests \
-	ole32/tests \
-	oleaut32/tests \
-	opengl32/tests \
-	pdh/tests \
-	psapi/tests \
-	qedit/tests \
-	qmgr/tests \
-	quartz/tests \
-	rasapi32/tests \
-	riched20/tests \
-	riched32/tests \
-	rpcrt4/tests \
-	rsaenh/tests \
-	schannel/tests \
-	secur32/tests \
-	serialui/tests \
-	setupapi/tests \
-	shdocvw/tests \
-	shell32/tests \
-	shlwapi/tests \
-	snmpapi/tests \
-	spoolss/tests \
-	urlmon/tests \
-	user32/tests \
-	userenv/tests \
-	usp10/tests \
-	uxtheme/tests \
-	version/tests \
-	winhttp/tests \
-	wininet/tests \
-	winmm/tests \
-	winspool.drv/tests \
-	wintrust/tests \
-	ws2_32/tests
-
-SUBDIRS = \
-	$(BASEDIRS) \
-	$(IMPLIBSUBDIRS) \
-	$(TESTSUBDIRS) \
-	glu32 \
-	opengl32 \
-	winequartz.drv \
-	winex11.drv
-
 BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)
 INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS)
 DOCSUBDIRS     = $(BASEDIRS) $(EXTRADIRS)

tools/make_makefiles

@@ -278,7 +278,11 @@ sub update_makefiles(@)
     {
         my %make = %{$makefiles{$file}};
         my $rules = $make{"=rules"};
-        push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules])\n";
+        my $args = "";
+        if ($rules eq $makerules{"MAKE_DLL_RULES"}) { $args = ",[dlls],[ALL_DLL_DIRS]"; }
+        elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; }
+        elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS]"; }
+        push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";
     }
 
     push @lines, "\nAC_OUTPUT\n";
@@ -318,7 +322,7 @@ sub update_ignores(@)
 
 sub update_dlls(@)
 {
-    my (%directories, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
+    my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
     my $text = "";
     my @ignores = ();
 
@@ -326,13 +330,7 @@ sub update_dlls(@)
     {
         my %makefile = %{$makefiles{$make}};
         next if defined $makefile{"=skip"};
-
-        if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
-        {
-            $testdirs{$1} = "$1/tests";
-            (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//;
-            next;
-        }
+        next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"});
 
         next unless defined $makefile{"MODULE"};
         my $module = $makefile{"MODULE"};
@@ -405,15 +403,6 @@ sub update_dlls(@)
         $text .= " \\\n\t" . $dir;
     }
 
-    $text .= "\n\nIMPLIBSUBDIRS = \\\n\t";
-    $text .=  join " \\\n\t", sort values %staticlib_dirs;
-
-    $text .= "\n\nTESTSUBDIRS = \\\n\t";
-    $text .= join " \\\n\t", sort values %testdirs;
-
-    $text .=  "\n\nSUBDIRS = \\\n\t";
-    $text .= join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)", sort keys %special_dlls;
-
     $text .= "\n\nBUILDSUBDIRS   = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)\n";
     $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n";
     $text .= "DOCSUBDIRS     = \$(BASEDIRS) \$(EXTRADIRS)\n";