Moved all the files in graphics/x11drv to dlls/x11drv.

configure

@@ -17249,8 +17249,6 @@ esac
 
           ac_config_commands="$ac_config_commands graphics"
 
-          ac_config_commands="$ac_config_commands graphics/x11drv"
-
           ac_config_commands="$ac_config_commands include/wine"
 
           ac_config_commands="$ac_config_commands misc"
@@ -18022,7 +18020,6 @@ do
   "dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;;
   "files" ) CONFIG_COMMANDS="$CONFIG_COMMANDS files" ;;
   "graphics" ) CONFIG_COMMANDS="$CONFIG_COMMANDS graphics" ;;
-  "graphics/x11drv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS graphics/x11drv" ;;
   "include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
   "misc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS misc" ;;
   "objects" ) CONFIG_COMMANDS="$CONFIG_COMMANDS objects" ;;
@@ -18747,8 +18744,6 @@ echo "$as_me: creating dlls/wineps/data" >&6;} && mkdir "dlls/wineps/data") ;;
 echo "$as_me: creating files" >&6;} && mkdir "files") ;;
     graphics ) test -d "graphics" || ({ echo "$as_me:$LINENO: creating graphics" >&5
 echo "$as_me: creating graphics" >&6;} && mkdir "graphics") ;;
-    graphics/x11drv ) test -d "graphics/x11drv" || ({ echo "$as_me:$LINENO: creating graphics/x11drv" >&5
-echo "$as_me: creating graphics/x11drv" >&6;} && mkdir "graphics/x11drv") ;;
     include/wine ) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5
 echo "$as_me: creating include/wine" >&6;} && mkdir "include/wine") ;;
     misc ) test -d "misc" || ({ echo "$as_me:$LINENO: creating misc" >&5

configure.ac

@@ -1450,7 +1450,6 @@ WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps/data)
 WINE_CONFIG_EXTRA_DIR(files)
 WINE_CONFIG_EXTRA_DIR(graphics)
-WINE_CONFIG_EXTRA_DIR(graphics/x11drv)
 WINE_CONFIG_EXTRA_DIR(include/wine)
 WINE_CONFIG_EXTRA_DIR(misc)
 WINE_CONFIG_EXTRA_DIR(objects)

dlls/x11drv/Makefile.in

@@ -9,44 +9,41 @@ EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = $(LIBUNICODE) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
 
 C_SRCS = \
-	$(TOPOBJDIR)/graphics/x11drv/bitblt.c \
+	bitblt.c \
-	$(TOPOBJDIR)/graphics/x11drv/bitmap.c \
+	bitmap.c \
-	$(TOPOBJDIR)/graphics/x11drv/brush.c \
+	brush.c \
-	$(TOPOBJDIR)/graphics/x11drv/clipping.c \
-	$(TOPOBJDIR)/graphics/x11drv/codepage.c \
-	$(TOPOBJDIR)/graphics/x11drv/dib.c \
-	$(TOPOBJDIR)/graphics/x11drv/graphics.c \
-	$(TOPOBJDIR)/graphics/x11drv/init.c \
-	$(TOPOBJDIR)/graphics/x11drv/opengl.c \
-	$(TOPOBJDIR)/graphics/x11drv/palette.c \
-	$(TOPOBJDIR)/graphics/x11drv/pen.c \
-	$(TOPOBJDIR)/graphics/x11drv/text.c \
-	$(TOPOBJDIR)/graphics/x11drv/xfont.c \
 	clipboard.c \
+	clipping.c \
+	codepage.c \
 	desktop.c \
 	dga2.c \
+	dib.c \
 	dib_convert.c \
 	dib_dst_swap.c \
 	dib_src_swap.c \
 	event.c \
+	graphics.c \
+	init.c \
 	keyboard.c \
 	mouse.c \
+	opengl.c \
+	palette.c \
+	pen.c \
 	scroll.c \
 	settings.c \
+	text.c \
 	window.c \
 	winpos.c \
 	x11ddraw.c \
 	x11drv_main.c \
 	xdnd.c \
+	xfont.c \
 	xrandr.c \
 	xrender.c \
 	xvidmode.c
 
 PROGRAMS = wineclipsrv
 
-EXTRASUBDIRS = \
-	$(TOPOBJDIR)/graphics/x11drv
-
 @MAKE_DLL_RULES@
 
 all: $(PROGRAMS)

tools/winapi_check/modules.dat

@@ -689,4 +689,3 @@ dlls/wintrust
 % dlls/x11drv/x11drv.spec
 
 dlls/x11drv
-graphics/x11drv