Renamed comm.dll, display.dll, keyboard.dll and mouse.dll to use the

dlls/Makefile.in

@@ -148,21 +148,21 @@ INSTALLSUBDIRS = $(BUILDSUBDIRS)
 
 WIN16_FILES = \
 	avifile.dll$(DLLEXT) \
-	comm.dll$(DLLEXT) \
+	comm.drv$(DLLEXT) \
 	commdlg.dll$(DLLEXT) \
 	compobj.dll$(DLLEXT) \
 	ctl3d.dll$(DLLEXT) \
 	ctl3dv2.dll$(DLLEXT) \
 	ddeml.dll$(DLLEXT) \
 	dispdib.dll$(DLLEXT) \
-	display.dll$(DLLEXT) \
+	display.drv$(DLLEXT) \
 	gdi.exe$(DLLEXT) \
 	imm.dll$(DLLEXT) \
-	keyboard.dll$(DLLEXT) \
+	keyboard.drv$(DLLEXT) \
 	krnl386.exe$(DLLEXT) \
 	lzexpand.dll$(DLLEXT) \
 	mmsystem.dll$(DLLEXT) \
-	mouse.dll$(DLLEXT) \
+	mouse.drv$(DLLEXT) \
 	msacm.dll$(DLLEXT) \
 	msvideo.dll$(DLLEXT) \
 	ole2.dll$(DLLEXT) \
@@ -439,7 +439,7 @@ iphlpapi.dll$(DLLEXT): iphlpapi/iphlpapi.dll$(DLLEXT)
 joystick.drv$(DLLEXT): winmm/joystick/joystick.drv$(DLLEXT)
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv$(DLLEXT) $@
 
-kernel32.dll$(DLLEXT) comm.dll$(DLLEXT) krnl386.exe$(DLLEXT) \
+kernel32.dll$(DLLEXT) comm.drv$(DLLEXT) krnl386.exe$(DLLEXT) \
   stress.dll$(DLLEXT) system.drv$(DLLEXT) toolhelp.dll$(DLLEXT) \
   win87em.dll$(DLLEXT) windebug.dll$(DLLEXT): kernel/kernel32.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) kernel/kernel32.dll$(DLLEXT) $@
@@ -611,8 +611,8 @@ url.dll$(DLLEXT): url/url.dll$(DLLEXT)
 urlmon.dll$(DLLEXT): urlmon/urlmon.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) urlmon/urlmon.dll$(DLLEXT) $@
 
-user32.dll$(DLLEXT) ddeml.dll$(DLLEXT) display.dll$(DLLEXT) \
-  keyboard.dll$(DLLEXT) mouse.dll$(DLLEXT) user.exe$(DLLEXT): user/user32.dll$(DLLEXT)
+user32.dll$(DLLEXT) ddeml.dll$(DLLEXT) display.drv$(DLLEXT) \
+  keyboard.drv$(DLLEXT) mouse.drv$(DLLEXT) user.exe$(DLLEXT): user/user32.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) user/user32.dll$(DLLEXT) $@
 
 version.dll$(DLLEXT) ver.dll$(DLLEXT): version/version.dll$(DLLEXT)

dlls/kernel/.cvsignore

 Makefile
-comm.spec.c
+comm.drv.spec.c
 kernel.res
 kernel32.dll.dbg.c
 kernel32.spec.c

dlls/kernel/Makefile.in

@@ -5,13 +5,13 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = kernel32.dll
 IMPORTS   = ntdll
-ALTNAMES  = krnl386.exe comm.dll stress.dll system.drv toolhelp.dll windebug.dll win87em.dll
+ALTNAMES  = krnl386.exe comm.drv stress.dll system.drv toolhelp.dll windebug.dll win87em.dll
 LDIMPORTS = ntdll.dll
 EXTRALIBS = $(LIBUNICODE)
 DLLMAIN   = MAIN_KernelInit
 
 SPEC_SRCS16 = \
-	comm.spec \
+	comm.drv.spec \
 	krnl386.exe.spec \
 	stress.spec \
 	system.drv.spec \

dlls/user/.cvsignore

 Makefile
 ddeml.spec.c
-display.spec.c
-keyboard.spec.c
-mouse.spec.c
+display.drv.spec.c
+keyboard.drv.spec.c
+mouse.drv.spec.c
 user.exe.spec.c
 user32.dll.dbg.c
 user32.spec.c

dlls/user/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
 IMPORTS   = gdi32 advapi32 kernel32 ntdll
-ALTNAMES  = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
+ALTNAMES  = user.exe ddeml.dll display.drv keyboard.drv mouse.drv
 EXTRALIBS = $(LIBUNICODE)
 DLLMAIN   = UserClientDllInitialize@12
 
@@ -14,9 +14,9 @@ SYMBOLFILE = $(MODULE).tmp.o
 
 SPEC_SRCS16 = \
 	ddeml.spec \
-	display.spec \
-	keyboard.spec \
-	mouse.spec \
+	display.drv.spec \
+	keyboard.drv.spec \
+	mouse.drv.spec \
 	user.exe.spec
 
 C_SRCS = \
@@ -113,11 +113,11 @@ EXTRASUBDIRS = \
 user.exe.spec.c: user.exe.spec resources/version16.res
 	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --heap 65520 --main-module $(MODULE) --res resources/version16.res --spec $(SRCDIR)/user.exe.spec
 
-display.spec.c: display.spec resources/display.res
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res resources/display.res --spec $(SRCDIR)/display.spec
+display.drv.spec.c: display.drv.spec resources/display.res
+	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res resources/display.res --spec $(SRCDIR)/display.drv.spec
 
-mouse.spec.c: mouse.spec resources/mouse.res
-	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res resources/mouse.res --spec $(SRCDIR)/mouse.spec
+mouse.drv.spec.c: mouse.drv.spec resources/mouse.res
+	$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --main-module $(MODULE) --res resources/mouse.res --spec $(SRCDIR)/mouse.drv.spec
 
 resources/display.res: resources/display.rc
 	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/display.rc