Merged wing.dll into gdi32.dll.

Make.rules.in

diff --git a/Make.rules.in b/Make.rules.in
index 14366c6..82eff95 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -147,7 +147,6 @@
 	w32skrnl \
 	wineoss.drv \
 	wineps \
-	wing \
 	wininet \
 	winmm \
 	winspool.drv \

configure

diff --git a/configure b/configure
index b4dfd86..293d067 100755
--- a/configure
+++ b/configure
@@ -6292,7 +6292,6 @@
 dlls/win32s/Makefile
 dlls/winaspi/Makefile
 dlls/wineps/Makefile
-dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile
@@ -6532,7 +6531,6 @@
 dlls/win32s/Makefile
 dlls/winaspi/Makefile
 dlls/wineps/Makefile
-dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile

configure.in

diff --git a/configure.in b/configure.in
index 547a407..0b0a53e 100644
--- a/configure.in
+++ b/configure.in
@@ -1036,7 +1036,6 @@
 dlls/win32s/Makefile
 dlls/winaspi/Makefile
 dlls/wineps/Makefile
-dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
 dlls/winmm/joystick/Makefile

dlls/Makefile.in

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b6e43ee..ab69f53 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -59,7 +59,6 @@
 	win32s/libw32skrnl.@LIBEXT@ \
 	winaspi/libwnaspi32.@LIBEXT@ \
 	wineps/libwineps.@LIBEXT@ \
-	wing/libwing.@LIBEXT@ \
 	wininet/libwininet.@LIBEXT@ \
 	winmm/joystick/libjoystick.drv.@LIBEXT@ \
 	winmm/libwinmm.@LIBEXT@ \
@@ -114,6 +113,7 @@
 	win87em \
 	winaspi \
 	windebug \
+	wing \
 	winsock \
 	wprocs
 
@@ -166,7 +166,6 @@
 	win32s \
 	winaspi \
 	wineps \
-	wing \
 	wininet \
 	winmm \
 	winsock \
@@ -211,7 +210,7 @@
 libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 	$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
 
-libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@: gdi/libgdi32.@LIBEXT@
+libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
@@ -351,9 +350,6 @@
 libwineps.@LIBEXT@: wineps/libwineps.@LIBEXT@
 	$(RM) $@ && $(LN_S) wineps/libwineps.@LIBEXT@ $@
 
-libwing.@LIBEXT@: wing/libwing.@LIBEXT@
-	$(RM) $@ && $(LN_S) wing/libwing.@LIBEXT@ $@
-
 libwininet.@LIBEXT@: wininet/libwininet.@LIBEXT@
 	$(RM) $@ && $(LN_S) wininet/libwininet.@LIBEXT@ $@
 

dlls/gdi/Makefile.in

diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 42da1f5..7680164 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -4,12 +4,13 @@
 VPATH     = @srcdir@
 MODULE    = gdi32
 SOVERSION = 1.0
-ALTNAMES  = gdi dispdib
+ALTNAMES  = gdi dispdib wing
 
 C_SRCS = \
 	bidi16.c \
 	gdi_main.c \
-	thunk.c
+	thunk.c \
+	wing.c
 
 GLUE = thunk.c
 

dlls/gdi/wing.c

diff --git a/dlls/wing/wing_main.c b/dlls/gdi/wing.c
similarity index 100%
rename from dlls/wing/wing_main.c
rename to dlls/gdi/wing.c

dlls/gdi/wing.spec

diff --git a/dlls/wing/wing.spec b/dlls/gdi/wing.spec
similarity index 100%
rename from dlls/wing/wing.spec
rename to dlls/gdi/wing.spec

dlls/wing/.cvsignore

diff --git a/dlls/wing/.cvsignore b/dlls/wing/.cvsignore
deleted file mode 100644
index d9bf7e9..0000000
--- a/dlls/wing/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.spec.c
-*.spec.glue.s
-Makefile
-libwing.so.1.0

dlls/wing/Makefile.in

diff --git a/dlls/wing/Makefile.in b/dlls/wing/Makefile.in
deleted file mode 100644
index 2f754d4..0000000
--- a/dlls/wing/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = wing
-SOVERSION = 1.0
-
-C_SRCS = \
-	wing_main.c
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
-