Moved remaining files from graphics/ to dlls/gdi.

configure

@@ -19096,8 +19096,6 @@ esac
 
           ac_config_commands="$ac_config_commands files"
 
-          ac_config_commands="$ac_config_commands graphics"
-
           ac_config_commands="$ac_config_commands include/wine"
 
           ac_config_commands="$ac_config_commands misc"
@@ -19877,7 +19875,6 @@ do
   "dlls/user/resources" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;;
   "dlls/wineps/data" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps/data" ;;
   "files" ) CONFIG_COMMANDS="$CONFIG_COMMANDS files" ;;
-  "graphics" ) CONFIG_COMMANDS="$CONFIG_COMMANDS graphics" ;;
   "include/wine" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
   "misc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS misc" ;;
   "objects" ) CONFIG_COMMANDS="$CONFIG_COMMANDS objects" ;;
@@ -20693,8 +20690,6 @@ echo "$as_me: creating dlls/user/resources" >&6;} && mkdir "dlls/user/resources"
 echo "$as_me: creating dlls/wineps/data" >&6;} && mkdir "dlls/wineps/data") ;;
     files ) test -d "files" || ({ echo "$as_me:$LINENO: creating files" >&5
 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") ;;
     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

@@ -1441,7 +1441,6 @@ WINE_CONFIG_EXTRA_DIR(dlls/user/dde)
 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(include/wine)
 WINE_CONFIG_EXTRA_DIR(misc)
 WINE_CONFIG_EXTRA_DIR(objects)

dlls/gdi/Makefile.in

@@ -15,10 +15,6 @@ SPEC_SRCS16 = \
 	wing.spec
 
 C_SRCS = \
-	$(TOPOBJDIR)/graphics/bitblt.c \
-	$(TOPOBJDIR)/graphics/mapping.c \
-	$(TOPOBJDIR)/graphics/painting.c \
-	$(TOPOBJDIR)/graphics/path.c \
 	$(TOPOBJDIR)/objects/bitmap.c \
 	$(TOPOBJDIR)/objects/brush.c \
 	$(TOPOBJDIR)/objects/clipping.c \
@@ -35,6 +31,7 @@ C_SRCS = \
 	$(TOPOBJDIR)/objects/region.c \
 	$(TOPOBJDIR)/objects/text.c \
 	bidi.c \
+	bitblt.c \
 	driver.c \
 	enhmfdrv/bitblt.c \
 	enhmfdrv/dc.c \
@@ -45,6 +42,7 @@ C_SRCS = \
 	freetype.c \
 	gdi_main.c \
 	icm.c \
+	mapping.c \
 	mfdrv/bitblt.c \
 	mfdrv/dc.c \
 	mfdrv/graphics.c \
@@ -52,6 +50,8 @@ C_SRCS = \
 	mfdrv/mapping.c \
 	mfdrv/objects.c \
 	mfdrv/text.c \
+	painting.c \
+	path.c \
 	printdrv.c
 
 C_SRCS16 = \
@@ -67,7 +67,6 @@ RC_SRCS16 = version16.rc
 SUBDIRS = tests
 
 EXTRASUBDIRS = \
-	$(TOPOBJDIR)/graphics \
 	$(TOPOBJDIR)/objects \
 	enhmfdrv \
 	mfdrv