dlls: d3d8, d3d9 and ddraw no longer depend on OpenGL or X.

dlls/Makefile.in

@@ -9,8 +9,8 @@ VPATH     = @srcdir@
 
 GLU32FILES = glu32
 GLUT32FILES = glut32
-OPENGLFILES = d3d8 d3d9 d3dx8 opengl32 wined3d
-XFILES = ddraw x11drv
+OPENGLFILES = opengl32 wined3d
+XFILES = x11drv
 EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@
 
 # Subdir list
@@ -34,11 +34,15 @@ BASEDIRS = \
 	crypt32 \
 	cryptdll \
 	ctl3d32 \
+	d3d8 \
+	d3d9 \
 	d3dim \
 	d3drm \
+	d3dx8 \
 	d3dxof \
 	dbghelp \
 	dciman32 \
+	ddraw \
 	devenum \
 	dinput \
 	dinput8 \
@@ -199,10 +203,6 @@ IMPLIBSUBDIRS = \
 SUBDIRS = \
 	$(BASEDIRS) \
 	$(IMPLIBSUBDIRS) \
-	d3d8 \
-	d3d9 \
-	d3dx8 \
-	ddraw \
 	glu32 \
 	glut32 \
 	opengl32 \
@@ -299,9 +299,6 @@ x11drv.dll.so: winex11.drv.so
 
 # Map symlink name to the corresponding library
 
-ddraw.dll.so: ddraw/ddraw.dll.so
-	$(RM) $@ && $(LN_S) ddraw/ddraw.dll.so $@
-
 gdi32.dll.so: gdi/gdi32.dll.so
 	$(RM) $@ && $(LN_S) gdi/gdi32.dll.so $@
 
@@ -918,7 +915,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 
 # Map library name to the corresponding directory
 
-ddraw/ddraw.dll.so: ddraw
 gdi/gdi32.dll.so: gdi
 winmm/joystick/joystick.drv.so: winmm/joystick
 kernel/kernel32.dll.so: kernel

dlls/make_dlls

@@ -33,13 +33,9 @@ my %altnames = ();
 # list of special dlls that can be switched on or off by configure
 my %special_dlls =
 (
-  "ddraw"    => "XFILES",
   "glu32"    => "GLU32FILES",
   "glut32"   => "GLUT32FILES",
   "opengl32" => "OPENGLFILES",
-  "d3d8"     => "OPENGLFILES",
-  "d3d9"     => "OPENGLFILES",
-  "d3dx8"    => "OPENGLFILES",
   "wined3d"  => "OPENGLFILES",
   "x11drv"   => "XFILES"
 );
@@ -222,7 +218,7 @@ EOF
 print NEWMAKE "# Map symlink name to the corresponding library\n\n";
 foreach my $mod (sort keys %directories)
 {
-    next unless (needs_symlink($mod) || $mod eq "ddraw.dll"); # FIXME: hack because of x11drv
+    next unless needs_symlink($mod);
     printf NEWMAKE "%s.so: %s/%s.so\n", $mod, $directories{$mod}, $mod;
     printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s.so \$@\n\n", $directories{$mod}, $mod;
 }
@@ -303,7 +299,7 @@ print NEWMAKE "# Map library name to the corresponding directory\n\n";
 
 foreach my $mod (sort keys %directories)
 {
-    next unless (needs_symlink($mod) || $mod eq "ddraw.dll"); # FIXME: hack because of x11drv
+    next unless needs_symlink($mod);
     printf NEWMAKE "%s/%s.so: %s\n", $directories{$mod}, $mod, $directories{$mod};
 }
 foreach my $mod (sort keys %staticlib_dirs)

programs/winetest/Makefile.in

@@ -18,17 +18,15 @@ RC_SRCS = \
 RC_BINSRC = winetest.rc
 RC_BINARIES = wine.ico 
 
-XFILES = ddraw_test.exe$(DLLEXT)
-OPENGLFILES = d3d8_test.exe$(DLLEXT) d3d9_test.exe$(DLLEXT)
-
 TESTBINS = \
-	@OPENGLFILES@ \
-	@XFILES@ \
-	advpack_test.exe$(DLLEXT) \
 	advapi32_test.exe$(DLLEXT) \
+	advpack_test.exe$(DLLEXT) \
 	cabinet_test.exe$(DLLEXT) \
 	comctl32_test.exe$(DLLEXT) \
 	crypt32_test.exe$(DLLEXT) \
+	d3d8_test.exe$(DLLEXT) \
+	d3d9_test.exe$(DLLEXT) \
+	ddraw_test.exe$(DLLEXT) \
 	dinput_test.exe$(DLLEXT) \
 	dnsapi_test.exe$(DLLEXT) \
 	dsound_test.exe$(DLLEXT) \