Moved all the files in graphics/x11drv to dlls/x11drv.
diff --git a/configure b/configure
index c6814d3..9c67242 100755
--- a/configure
+++ b/configure
@@ -17249,8 +17249,6 @@
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 @@
"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 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
diff --git a/configure.ac b/configure.ac
index bb4532c..c6d51f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1450,7 +1450,6 @@
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)
diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in
index c795470..240f18f 100644
--- a/dlls/x11drv/Makefile.in
+++ b/dlls/x11drv/Makefile.in
@@ -9,44 +9,41 @@
EXTRALIBS = $(LIBUNICODE) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
C_SRCS = \
- $(TOPOBJDIR)/graphics/x11drv/bitblt.c \
- $(TOPOBJDIR)/graphics/x11drv/bitmap.c \
- $(TOPOBJDIR)/graphics/x11drv/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 \
+ bitblt.c \
+ bitmap.c \
+ brush.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)
diff --git a/graphics/x11drv/bitblt.c b/dlls/x11drv/bitblt.c
similarity index 100%
rename from graphics/x11drv/bitblt.c
rename to dlls/x11drv/bitblt.c
diff --git a/graphics/x11drv/bitmap.c b/dlls/x11drv/bitmap.c
similarity index 100%
rename from graphics/x11drv/bitmap.c
rename to dlls/x11drv/bitmap.c
diff --git a/graphics/x11drv/brush.c b/dlls/x11drv/brush.c
similarity index 100%
rename from graphics/x11drv/brush.c
rename to dlls/x11drv/brush.c
diff --git a/graphics/x11drv/clipping.c b/dlls/x11drv/clipping.c
similarity index 100%
rename from graphics/x11drv/clipping.c
rename to dlls/x11drv/clipping.c
diff --git a/graphics/x11drv/codepage.c b/dlls/x11drv/codepage.c
similarity index 100%
rename from graphics/x11drv/codepage.c
rename to dlls/x11drv/codepage.c
diff --git a/graphics/x11drv/dib.c b/dlls/x11drv/dib.c
similarity index 100%
rename from graphics/x11drv/dib.c
rename to dlls/x11drv/dib.c
diff --git a/graphics/x11drv/graphics.c b/dlls/x11drv/graphics.c
similarity index 100%
rename from graphics/x11drv/graphics.c
rename to dlls/x11drv/graphics.c
diff --git a/graphics/x11drv/init.c b/dlls/x11drv/init.c
similarity index 100%
rename from graphics/x11drv/init.c
rename to dlls/x11drv/init.c
diff --git a/graphics/x11drv/opengl.c b/dlls/x11drv/opengl.c
similarity index 100%
rename from graphics/x11drv/opengl.c
rename to dlls/x11drv/opengl.c
diff --git a/graphics/x11drv/palette.c b/dlls/x11drv/palette.c
similarity index 100%
rename from graphics/x11drv/palette.c
rename to dlls/x11drv/palette.c
diff --git a/graphics/x11drv/pen.c b/dlls/x11drv/pen.c
similarity index 100%
rename from graphics/x11drv/pen.c
rename to dlls/x11drv/pen.c
diff --git a/graphics/x11drv/text.c b/dlls/x11drv/text.c
similarity index 100%
rename from graphics/x11drv/text.c
rename to dlls/x11drv/text.c
diff --git a/graphics/x11drv/xfont.c b/dlls/x11drv/xfont.c
similarity index 100%
rename from graphics/x11drv/xfont.c
rename to dlls/x11drv/xfont.c
diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 691657b..ed62936 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -689,4 +689,3 @@
% dlls/x11drv/x11drv.spec
dlls/x11drv
-graphics/x11drv
