Moved metafiles and win16 drivers to dlls/gdi.

configure.ac

@@ -1255,6 +1255,9 @@ WINE_CONFIG_EXTRA_DIR(dlls/ddraw/dsurface)
 WINE_CONFIG_EXTRA_DIR(dlls/dinput/joystick)
 WINE_CONFIG_EXTRA_DIR(dlls/dinput/keyboard)
 WINE_CONFIG_EXTRA_DIR(dlls/dinput/mouse)
+WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
+WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
+WINE_CONFIG_EXTRA_DIR(dlls/gdi/win16drv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/tests)
 WINE_CONFIG_EXTRA_DIR(dlls/oleaut32/tests)
@@ -1388,9 +1391,6 @@ dlls/x11drv/Makefile
 documentation/Makefile
 files/Makefile
 graphics/Makefile
-graphics/enhmetafiledrv/Makefile
-graphics/metafiledrv/Makefile
-graphics/win16drv/Makefile
 graphics/x11drv/Makefile
 if1632/Makefile
 include/Makefile

dlls/gdi/Makefile.in

@@ -12,9 +12,29 @@ EXTRAINCL = @FREETYPEINCL@
 C_SRCS = \
 	bidi16.c \
 	driver.c \
+	enhmfdrv/dc.c \
+	enhmfdrv/graphics.c \
+	enhmfdrv/init.c \
+	enhmfdrv/mapping.c \
+	enhmfdrv/objects.c \
 	freetype.c \
 	gdi_main.c \
+	mfdrv/bitblt.c \
+	mfdrv/dc.c \
+	mfdrv/graphics.c \
+	mfdrv/init.c \
+	mfdrv/mapping.c \
+	mfdrv/objects.c \
+	mfdrv/text.c \
 	printdrv.c \
+	win16drv/brush.c \
+	win16drv/font.c \
+	win16drv/graphics.c \
+	win16drv/init.c \
+	win16drv/objects.c \
+	win16drv/pen.c \
+	win16drv/prtdrv.c \
+	win16drv/text.c \
 	wing.c
 
 RC_SRCS= \
@@ -23,22 +43,23 @@ RC_SRCS= \
 RC_SRCS16= \
 	version16.rc
 
-GLUE = printdrv.c
+GLUE = \
+	printdrv.c \
+	win16drv/prtdrv.c
 
 EXTRA_OBJS = \
 	$(TOPOBJDIR)/graphics/graphics.o \
-	$(TOPOBJDIR)/graphics/enhmetafiledrv/enhmetafiledrv.o \
-	$(TOPOBJDIR)/graphics/metafiledrv/metafiledrv.o \
-	$(TOPOBJDIR)/graphics/win16drv/win16drv.o \
 	$(TOPOBJDIR)/objects/objects.o
 
 SUBDIRS = \
 	$(TOPOBJDIR)/graphics \
-	$(TOPOBJDIR)/graphics/enhmetafiledrv \
-	$(TOPOBJDIR)/graphics/metafiledrv \
-	$(TOPOBJDIR)/graphics/win16drv \
 	$(TOPOBJDIR)/objects
 
+EXTRASUBDIRS = \
+	enhmfdrv \
+	mfdrv \
+	win16drv
+
 @MAKE_DLL_RULES@
 
 $(EXTRA_OBJS): dummy

dlls/gdi/driver.c

@@ -24,7 +24,7 @@
 #include "ntddk.h"
 
 #include "gdi.h"
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(driver);

graphics/enhmetafiledrv/dc.c → dlls/gdi/enhmfdrv/dc.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "enhmetafiledrv.h"
+#include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);

graphics/enhmetafiledrv/graphics.c → dlls/gdi/enhmfdrv/graphics.c

@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "gdi.h"
-#include "enhmetafiledrv.h"
+#include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);

graphics/enhmetafiledrv/init.c → dlls/gdi/enhmfdrv/init.c

@@ -23,7 +23,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "gdi.h"
-#include "enhmetafiledrv.h"
+#include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);

graphics/enhmetafiledrv/mapping.c → dlls/gdi/enhmfdrv/mapping.c

@@ -17,7 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "enhmetafiledrv.h"
+
+#include "enhmfdrv/enhmetafiledrv.h"
 
 BOOL EMFDRV_SetViewportExt( DC *dc, INT cx, INT cy )
 {

graphics/enhmetafiledrv/objects.c → dlls/gdi/enhmfdrv/objects.c

@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "bitmap.h"
-#include "enhmetafiledrv.h"
+#include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);

dlls/gdi/gdi_main.c

@@ -24,7 +24,6 @@
 #include "wine/winbase16.h"
 
 #include "gdi.h"
-#include "win16drv.h"
 #include "winbase.h"
 
 /***********************************************************************

graphics/metafiledrv/bitblt.c → dlls/gdi/mfdrv/bitblt.c

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "gdi.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 #include "bitmap.h"
 

graphics/metafiledrv/dc.c → dlls/gdi/mfdrv/dc.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 
 INT MFDRV_SaveDC( DC *dc )
 {

graphics/metafiledrv/graphics.c → dlls/gdi/mfdrv/graphics.c

@@ -23,7 +23,7 @@
 
 #include "gdi.h"
 #include "region.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);

graphics/metafiledrv/init.c → dlls/gdi/mfdrv/init.c

@@ -22,7 +22,7 @@
 #include "wine/winbase16.h"
 #include "gdi.h"
 #include "metafile.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);

graphics/metafiledrv/mapping.c → dlls/gdi/mfdrv/mapping.c

@@ -19,7 +19,7 @@
  */
 
 #include "gdi.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 
 
 /***********************************************************************

graphics/metafiledrv/objects.c → dlls/gdi/mfdrv/objects.c

@@ -24,7 +24,7 @@
 
 #include "bitmap.h"
 #include "font.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);

graphics/metafiledrv/text.c → dlls/gdi/mfdrv/text.c

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "windef.h"
-#include "metafiledrv.h"
+#include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(metafile);

graphics/win16drv/.cvsignore → dlls/gdi/win16drv/.cvsignore

-Makefile
 prtdrv.glue.c

graphics/win16drv/brush.c → dlls/gdi/win16drv/brush.c

@@ -19,7 +19,7 @@
  */
 
 #include <stdlib.h>
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win16drv);

graphics/win16drv/font.c → dlls/gdi/win16drv/font.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include "winnls.h"
 #include "wine/winbase16.h"
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "font.h"
 #include "gdi.h"
 #include "wine/debug.h"

graphics/win16drv/graphics.c → dlls/gdi/win16drv/graphics.c

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win16drv);

graphics/win16drv/init.c → dlls/gdi/win16drv/init.c

@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "winreg.h"
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "gdi.h"
 #include "bitmap.h"
 #include "font.h"

graphics/win16drv/objects.c → dlls/gdi/win16drv/objects.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 
 #include "wine/debug.h"
 

graphics/win16drv/pen.c → dlls/gdi/win16drv/pen.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win16drv);

graphics/win16drv/prtdrv.c → dlls/gdi/win16drv/prtdrv.c

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include "wine/winbase16.h"
 #include "winuser.h"
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "wine/debug.h"
 #include "bitmap.h"
 

graphics/win16drv/text.c → dlls/gdi/win16drv/text.c

@@ -20,7 +20,7 @@
  */
 
 #include <stdlib.h>
-#include "win16drv.h"
+#include "win16drv/win16drv.h"
 #include "gdi.h"
 #include "wine/debug.h"
 #include "winbase.h"

graphics/enhmetafiledrv/.cvsignore

-Makefile

graphics/enhmetafiledrv/Makefile.in

-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = enhmetafiledrv
-
-C_SRCS = \
-	dc.c \
-	graphics.c \
-	init.c \
-	mapping.c \
-	objects.c 
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-	$(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:

graphics/metafiledrv/.cvsignore

-Makefile

graphics/metafiledrv/Makefile.in

-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = metafiledrv
-
-C_SRCS = \
-	bitblt.c \
-	dc.c \
-	graphics.c \
-	init.c \
-	mapping.c \
-	objects.c \
-	text.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-	$(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies:

graphics/win16drv/Makefile.in

-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = win16drv
-
-C_SRCS = \
-	brush.c \
-	font.c \
-	graphics.c \
-	init.c \
-	objects.c \
-	pen.c \
-	prtdrv.c \
-	text.c
-
-GLUE = prtdrv.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-	$(LDCOMBINE) $(OBJS) -o $@
-
-### Dependencies: