rename source files for consistency

8 files changed, 14 insertions, 13 deletions

diff --git a/makefile b/makefile
index a10e671..1eb22d5 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,9 @@
 # This is an Open Watcom wmake makefile, not GNU make.
 # Assuming you have sourced `owsetenv` beforehand.
-# 
-dosobjs = dostsr.obj dosmain.obj vbox.obj
+
+mousedosobjs = mousetsr.obj mousmain.obj vbox.obj
+mousew16objs = mousew16.obj
+
 doscflags = -bt=dos -ms -6 -osi -w3 -wcd=202
 # -ms to use small memory model (though sometimes ss != ds...)
 # -osi to optimize for size, put intrinsics inline (to avoid runtime calls)
@@ -11,7 +13,6 @@ dostsrcflags = -zu -s -g=RES_GROUP -nd=RES -nt=RES_TEXT -nc=RES_CODE
 # -s to disable stack checks, since it inserts calls to the runtime from the TSR part
 # -zu since ss != ds on the TSR
 
-w16objs = w16mouse.obj
 w16cflags = -bt=windows -bd -mc -zu -s -6 -oi -w3 -wcd=202
 # -bd to build DLL
 # -mc to use compact memory model (far data pointers, ss != ds in a DLL)
@@ -23,22 +24,22 @@ w16cflags = -bt=windows -bd -mc -zu -s -6 -oi -w3 -wcd=202
 	set include=$(%watcom)/h/win;$(%watcom)/h
 
 # Main DOS driver file
-vbmouse.exe: dosmouse.lnk $(dosobjs) 
-	wlink @$[@ name $@ file { $(dosobjs) } 
+vbmouse.exe: vbmouse.lnk $(mousedosobjs) 
+	wlink @$[@ name $@ file { $(mousedosobjs) } 
 
-dostsr.obj: dostsr.c .AUTODEPEND
+mousetsr.obj: mousetsr.c .AUTODEPEND
 	wcc -fo=$^@ $(doscflags) $(dostsrcflags) $[@
 
-dosmain.obj: dosmain.c .AUTODEPEND
+mousmain.obj: mousmain.c .AUTODEPEND
 	wcc -fo=$^@ $(doscflags) $[@
 
 vbox.obj: vbox.c .AUTODEPEND
 	wcc -fo=$^@ $(doscflags) $[@
 
-vbmouse.drv: w16mouse.lnk $(w16objs)
-	wlink @$[@ name $@ file { $(w16objs) }
+vbmouse.drv: mousew16.lnk $(mousew16objs)
+	wlink @$[@ name $@ file { $(mousew16objs) }
 
-w16mouse.obj: w16mouse.c .AUTODEPEND
+mousew16.obj: mousew16.c .AUTODEPEND
 	wcc -fo=$^@ $(w16cflags) $[@
 
 clean: .SYMBOLIC
diff --git a/dostsr.c b/mousetsr.c
index a9319d3..fed2c9b 100644
--- a/dostsr.c
+++ b/mousetsr.c
@@ -29,7 +29,7 @@
 #include "int33.h"
 #include "vbox.h"
 #include "vmware.h"
-#include "dostsr.h"
+#include "mousetsr.h"
 
 #define MSB_MASK 0x8000U
 
diff --git a/dostsr.h b/mousetsr.h
index a025c92..a025c92 100644
--- a/dostsr.h
+++ b/mousetsr.h
diff --git a/w16mouse.c b/mousew16.c
index 910358f..6e70371 100644
--- a/w16mouse.c
+++ b/mousew16.c
@@ -23,7 +23,7 @@
 #include "utils.h"
 #include "int33.h"
 #include "int2fwin.h"
-#include "w16mouse.h"
+#include "mousew16.h"
 
 #define TRACE_EVENTS 0
 
diff --git a/w16mouse.h b/mousew16.h
index 54b262f..54b262f 100644
--- a/w16mouse.h
+++ b/mousew16.h
diff --git a/w16mouse.lnk b/mousew16.lnk
index bb80eb2..bb80eb2 100644
--- a/w16mouse.lnk
+++ b/mousew16.lnk
diff --git a/dosmain.c b/mousmain.c
index 9a802c6..5fe2246 100644
--- a/dosmain.c
+++ b/mousmain.c
@@ -29,7 +29,7 @@
 #include "ps2.h"
 #include "vbox.h"
 #include "vmware.h"
-#include "dostsr.h"
+#include "mousetsr.h"
 
 #if USE_WHEEL
 static void detect_wheel(LPTSRDATA data)
diff --git a/dosmouse.lnk b/vbmouse.lnk
index bc1596f..bc1596f 100644
--- a/dosmouse.lnk
+++ b/vbmouse.lnk