From 7f30083bbe8daa569c596f94aa4637307383b46c Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dimi@cs.toronto.edu>
Date: Tue, 30 May 2000 17:49:47 +0000
Subject: [PATCH] Moved DISPDIB out of the kernel into GDI.

---
 dlls/Makefile.in                  | 8 +++++++-
 dlls/gdi/Makefile.in              | 4 ++--
 {if1632 => dlls/gdi}/dispdib.spec | 0
 if1632/Makefile.in                | 2 --
 4 files changed, 9 insertions(+), 5 deletions(-)
 rename {if1632 => dlls/gdi}/dispdib.spec (100%)

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2f99f14254e..daac70b58f2 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -53,6 +53,7 @@ DLLFILES = \
 	win87em/libwin87em.@LIBEXT@ \
 	winaspi/libwnaspi32.@LIBEXT@ \
 	windebug/libwindebug.@LIBEXT@ \
+	wineps/libwineps.@LIBEXT@ \
 	wing/libwing.@LIBEXT@ \
 	wininet/libwininet.@LIBEXT@ \
 	winmm/joystick/libjoystick.drv.@LIBEXT@ \
@@ -74,6 +75,7 @@ EXTRADLLNAMES = \
 	commdlg \
 	compobj \
 	ddeml \
+	dispdib \
 	dplay \
 	gdi \
 	keyboard \
@@ -143,6 +145,7 @@ SUBDIRS = \
 	win87em \
 	winaspi \
 	windebug \
+	wineps \
 	wing \
 	wininet \
 	winmm \
@@ -180,7 +183,7 @@ libdplayx.@LIBEXT@ libdplay.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
 libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 	$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
 
-libgdi32.@LIBEXT@ libgdi.@LIBEXT@: gdi/libgdi32.@LIBEXT@
+libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
@@ -306,6 +309,9 @@ libwindebug.@LIBEXT@: windebug/libwindebug.@LIBEXT@
 libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@
 	$(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
 
+libwineps.@LIBEXT@: wineps/libwineps.@LIBEXT@
+	$(RM) $@ && $(LN_S) wineps/libwineps.@LIBEXT@ $@
+
 libwing.@LIBEXT@: wing/libwing.@LIBEXT@
 	$(RM) $@ && $(LN_S) wing/libwing.@LIBEXT@ $@
 
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 21a9fa32c6d..6b21acb9269 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -4,9 +4,9 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32
 SOVERSION = 1.0
-ALTNAMES  = gdi
+ALTNAMES  = gdi dispdib
 
-SPEC_SRCS = gdi32.spec gdi.spec
+SPEC_SRCS = gdi32.spec gdi.spec dispdib.spec
 
 C_SRCS = \
 	gdi_main.c \
diff --git a/if1632/dispdib.spec b/dlls/gdi/dispdib.spec
similarity index 100%
rename from if1632/dispdib.spec
rename to dlls/gdi/dispdib.spec
diff --git a/if1632/Makefile.in b/if1632/Makefile.in
index e73db048d44..f54f5dd01a1 100644
--- a/if1632/Makefile.in
+++ b/if1632/Makefile.in
@@ -7,11 +7,9 @@ MODULE    = if1632
 
 SPEC_SRCS = \
 	comm.spec \
-	dispdib.spec \
 	kernel.spec \
 	system.spec \
 	toolhelp.spec \
-	wineps.spec \
 	wprocs.spec
 
 C_SRCS = \