Renamed Winelib apps to .exe.so to follow the dll naming convention.
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index c4a9d90..1abc1ac 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -14,12 +14,13 @@
ALL_OBJS = $(OBJS) $(MODULE).dbg.o
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
SYMBOLFILE = $(MODULE).tmp.o
+BASEMODULE = $(MODULE:.exe=)
TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS)
RCOBJS = $(RC_SRCS:.rc=.res.o)
@MAKE_RULES@
-all: $(MODULE)$(EXEEXT)
+all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
# Rule for main module spec file
@@ -31,12 +32,12 @@
$(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in
$(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(ALL_OBJS) -o $@ $(ALL_LIBS)
-$(MODULE): $(MODULE).so
- $(RM) $(MODULE) && $(LN_S) $(TOPOBJDIR)/wine $(MODULE)
+$(BASEMODULE): $(MODULE).so
+ $(RM) $(BASEMODULE) && $(LN_S) $(TOPOBJDIR)/wine $(BASEMODULE)
# Rules for .exe main module
-$(MODULE).exe: $(ALL_OBJS) $(RCOBJS) Makefile.in
+$(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
# Rules for checking that no imports are missing
@@ -46,25 +47,25 @@
# Rules for testing
-$(TESTRESULTS): $(MODULE).so
+$(TESTRESULTS): $(MODULE)$(DLLEXT)
# Rules for installation
-.PHONY: install_prog$(EXEEXT)
+.PHONY: install_prog install_prog.so
-install_prog:: $(MODULE).so
+install_prog.so:: $(MODULE).so
$(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) $(MODULE).so $(bindir)/$(MODULE).so
- cd $(bindir) && $(RM) $(MODULE) && $(LN_S) wine $(MODULE)
+ cd $(bindir) && $(RM) $(BASEMODULE) && $(LN_S) wine $(BASEMODULE)
-install_prog.exe:: $(MODULE).exe
+install_prog.exe:: $(MODULE)
$(MKINSTALLDIRS) $(bindir)
- $(INSTALL_PROGRAM) $(MODULE).exe $(bindir)/$(MODULE).exe
+ $(INSTALL_PROGRAM) $(MODULE) $(bindir)/$(MODULE)
-install:: install_prog$(EXEEXT)
+install:: install_prog$(DLLEXT)
uninstall::
- $(RM) $(bindir)/$(MODULE)$(EXEEXT) $(bindir)/$(MODULE).so
+ $(RM) $(bindir)/$(BASEMODULE) $(bindir)/$(MODULE) $(bindir)/$(MODULE).so
clean::
- $(RM) $(MODULE)$(EXEEXT)
+ $(RM) $(BASEMODULE) $(MODULE)
diff --git a/programs/avitools/.cvsignore b/programs/avitools/.cvsignore
index 3c3070f..1b1c65a 100644
--- a/programs/avitools/.cvsignore
+++ b/programs/avitools/.cvsignore
@@ -1,7 +1,4 @@
Makefile
-icinfo
-icinfo.spec.c
-aviplay
-aviplay.spec.c
-aviinfo
-aviinfo.spec.c
+aviinfo.exe.spec.c
+aviplay.exe.spec.c
+icinfo.exe.spec.c
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 4accb84..4ff4f6f 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -5,54 +5,77 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
-PROGRAMS = icinfo aviinfo aviplay
+PROGRAMS = aviinfo.exe aviplay.exe icinfo.exe
ALL_LIBS = $(LIBWINE) $(LIBS)
-all: $(PROGRAMS)
+C_SRCS = \
+ aviinfo.c \
+ aviplay.c \
+ icinfo.c
@MAKE_RULES@
-aviinfo.spec.c: aviinfo.o $(WINEBUILD)
- $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32
+all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:%.exe=%$(EXEEXT))
-aviplay.spec.c: aviplay.o $(WINEBUILD)
- $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32
+aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD)
+ $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.exe.spec.c -exe aviinfo.exe -mgui -L$(DLLDIR) -lkernel32
-icinfo.spec.c: icinfo.o $(WINEBUILD)
- $(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32
+aviplay.exe.spec.c: aviplay.o $(WINEBUILD)
+ $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.exe.spec.c -exe aviplay.exe -mgui -L$(DLLDIR) -lddraw -lkernel32
-aviinfo.so: aviinfo.o aviinfo.spec.o
- $(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS)
+icinfo.exe.spec.c: icinfo.o $(WINEBUILD)
+ $(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.exe.spec.c -exe icinfo.exe -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32
-aviplay.so: aviplay.o aviplay.spec.o
- $(LDSHARED) $(LDDLLFLAGS) -o aviplay.so aviplay.o aviplay.spec.o $(ALL_LIBS)
+aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o
+ $(LDSHARED) $(LDDLLFLAGS) -o aviinfo.exe.so aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS)
-icinfo.so: icinfo.o icinfo.spec.o
- $(LDSHARED) $(LDDLLFLAGS) -o icinfo.so icinfo.o icinfo.spec.o $(ALL_LIBS)
+aviplay.exe.so: aviplay.o aviplay.exe.spec.o
+ $(LDSHARED) $(LDDLLFLAGS) -o aviplay.exe.so aviplay.o aviplay.exe.spec.o $(ALL_LIBS)
-aviinfo: aviinfo.so
+icinfo.exe.so: icinfo.o icinfo.exe.spec.o
+ $(LDSHARED) $(LDDLLFLAGS) -o icinfo.exe.so icinfo.o icinfo.exe.spec.o $(ALL_LIBS)
+
+aviinfo.exe: aviinfo.o
+ $(CC) -o $@ aviinfo.o -lkernel32 $(ALL_LIBS)
+
+aviplay.exe: aviplay.o
+ $(CC) -o $@ aviplay.o -lddraw -lkernel32 $(ALL_LIBS)
+
+icinfo.exe: icinfo.o
+ $(CC) -o $@ icinfo.o -lmsvfw32 -lkernel32 $(ALL_LIBS)
+
+aviinfo: aviinfo.exe.so
$(RM) aviinfo && $(LN_S) $(TOPOBJDIR)/wine aviinfo
-aviplay: aviplay.so
+aviplay: aviplay.exe.so
$(RM) aviplay && $(LN_S) $(TOPOBJDIR)/wine aviplay
-icinfo: icinfo.so
+icinfo: icinfo.exe.so
$(RM) icinfo && $(LN_S) $(TOPOBJDIR)/wine icinfo
-install:: $(PROGRAMS:%=%.so)
+.PHONY: install_prog install_prog.so
+
+install_prog.so:: $(PROGRAMS:%=%.so)
$(MKINSTALLDIRS) $(bindir)
- $(INSTALL_PROGRAM) aviinfo.so $(bindir)/aviinfo.so
- $(INSTALL_PROGRAM) aviplay.so $(bindir)/aviplay.so
- $(INSTALL_PROGRAM) icinfo.so $(bindir)/icinfo.so
+ $(INSTALL_PROGRAM) aviinfo.exe.so $(bindir)/aviinfo.exe.so
+ $(INSTALL_PROGRAM) aviplay.exe.so $(bindir)/aviplay.exe.so
+ $(INSTALL_PROGRAM) icinfo.exe.so $(bindir)/icinfo.exe.so
cd $(bindir) && $(LN_S) wine aviinfo && $(LN_S) wine aviplay && $(LN_S) wine icinfo
+install_prog:: $(PROGRAMS)
+ $(MKINSTALLDIRS) $(bindir)
+ $(INSTALL_PROGRAM) aviinfo.exe $(bindir)/aviinfo.exe
+ $(INSTALL_PROGRAM) aviplay.exe $(bindir)/aviplay.exe
+ $(INSTALL_PROGRAM) icinfo.exe $(bindir)/icinfo.exe
+
+install:: install_prog$(DLLEXT)
+
uninstall::
- $(RM) $(bindir)/aviinfo.so $(bindir)/aviplay.so $(bindir)/icinfo.so
- $(RM) $(bindir)/aviinfo $(bindir)/aviplay $(bindir)/icinfo
+ $(RM) $(PROGRAMS:%=$(bindir)/%$(DLLEXT)) $(PROGRAMS:%.exe=$(bindir)/%)
checklink:: $(PROGRAMS:%=%.so)
- $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.so && $(RM) checklink
- $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.so && $(RM) checklink
- $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.so && $(RM) checklink
+ $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.exe.so && $(RM) checklink
+ $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.exe.so && $(RM) checklink
+ $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.exe.so && $(RM) checklink
### Dependencies:
diff --git a/programs/clock/.cvsignore b/programs/clock/.cvsignore
index 2f2e0a9..a33b4a4 100644
--- a/programs/clock/.cvsignore
+++ b/programs/clock/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-clock
-clock.dbg.c
-clock.spec.c
+clock.exe.dbg.c
+clock.exe.spec.c
rsrc.res
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 57cb810..619bd86 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = clock
+MODULE = clock.exe
APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32
diff --git a/programs/cmdlgtst/.cvsignore b/programs/cmdlgtst/.cvsignore
index 684099c..6379400 100644
--- a/programs/cmdlgtst/.cvsignore
+++ b/programs/cmdlgtst/.cvsignore
@@ -1,5 +1,4 @@
Makefile
cmdlgr.res
-cmdlgtst
-cmdlgtst.dbg.c
-cmdlgtst.spec.c
+cmdlgtst.exe.dbg.c
+cmdlgtst.exe.spec.c
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index de36ae4..8eb34ab 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = cmdlgtst
+MODULE = cmdlgtst.exe
APPMODE = gui
IMPORTS = comdlg32 user32 gdi32 kernel32
diff --git a/programs/control/.cvsignore b/programs/control/.cvsignore
index 9f10f66..fdd533e 100644
--- a/programs/control/.cvsignore
+++ b/programs/control/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-control
-control.dbg.c
-control.spec.c
+control.exe.dbg.c
+control.exe.spec.c
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 0773ef6..93de5db 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = control
+MODULE = control.exe
APPMODE = gui
IMPORTS = shell32 user32 kernel32
diff --git a/programs/expand/.cvsignore b/programs/expand/.cvsignore
index c91b366..8c7062f 100644
--- a/programs/expand/.cvsignore
+++ b/programs/expand/.cvsignore
@@ -1,3 +1,3 @@
Makefile
-expand.dbg.c
-expand.spec.c
+expand.exe.dbg.c
+expand.exe.spec.c
diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in
index e4991b3..b7f47e5 100644
--- a/programs/expand/Makefile.in
+++ b/programs/expand/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = expand
+MODULE = expand.exe
APPMODE = cui
IMPORTS = lz32 kernel32
diff --git a/programs/notepad/.cvsignore b/programs/notepad/.cvsignore
index 127bbbf..ce4add1 100644
--- a/programs/notepad/.cvsignore
+++ b/programs/notepad/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-notepad
-notepad.dbg.c
-notepad.spec.c
+notepad.exe.dbg.c
+notepad.exe.spec.c
rsrc.res
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 75576f3..ef1b5c8 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = notepad
+MODULE = notepad.exe
APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32
diff --git a/programs/osversioncheck/.cvsignore b/programs/osversioncheck/.cvsignore
index 4da03d5..3e7c344 100644
--- a/programs/osversioncheck/.cvsignore
+++ b/programs/osversioncheck/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-osversioncheck
-osversioncheck.dbg.c
-osversioncheck.spec.c
+osversioncheck.exe.dbg.c
+osversioncheck.exe.spec.c
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index 90a6cbc..737cea3 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = osversioncheck
+MODULE = osversioncheck.exe
APPMODE = cui
IMPORTS = kernel32
diff --git a/programs/progman/.cvsignore b/programs/progman/.cvsignore
index 73bdce5..7a1eea1 100644
--- a/programs/progman/.cvsignore
+++ b/programs/progman/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-progman
-progman.dbg.c
-progman.spec.c
+progman.exe.dbg.c
+progman.exe.spec.c
rsrc.res
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index 99d6c2a..c358d7b 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = progman
+MODULE = progman.exe
APPMODE = gui
IMPORTS = shell32 comdlg32 user32 gdi32 kernel32
diff --git a/programs/regapi/.cvsignore b/programs/regapi/.cvsignore
index bfb8096..27c4628 100644
--- a/programs/regapi/.cvsignore
+++ b/programs/regapi/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-regapi
-regapi.dbg.c
-regapi.spec.c
+regapi.exe.dbg.c
+regapi.exe.spec.c
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index cf968f9..f4e8199 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = regapi
+MODULE = regapi.exe
APPMODE = gui
IMPORTS = advapi32 kernel32
diff --git a/programs/regedit/.cvsignore b/programs/regedit/.cvsignore
index dd85b97..4c4532d 100644
--- a/programs/regedit/.cvsignore
+++ b/programs/regedit/.cvsignore
@@ -1,3 +1,3 @@
Makefile
-regedit.dbg.c
-regedit.spec.c
+regedit.exe.dbg.c
+regedit.exe.spec.c
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index 9e785f6..2246306 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = regedit
+MODULE = regedit.exe
APPMODE = gui
IMPORTS = msvcrt advapi32 kernel32
diff --git a/programs/regsvr32/.cvsignore b/programs/regsvr32/.cvsignore
index 8e4e068..9537bf5 100644
--- a/programs/regsvr32/.cvsignore
+++ b/programs/regsvr32/.cvsignore
@@ -1,3 +1,3 @@
Makefile
-regsvr32.dbg.c
-regsvr32.spec.c
+regsvr32.exe.dbg.c
+regsvr32.exe.spec.c
diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in
index 8682764..7cbdcc0 100644
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@@ -3,7 +3,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = regsvr32
+MODULE = regsvr32.exe
APPMODE = cui
IMPORTS = msvcrt kernel32
diff --git a/programs/regtest/.cvsignore b/programs/regtest/.cvsignore
index b8a6b35..a727e8f 100644
--- a/programs/regtest/.cvsignore
+++ b/programs/regtest/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-regtest
-regtest.dbg.c
-regtest.spec.c
+regtest.exe.dbg.c
+regtest.exe.spec.c
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index 92bfac2..6fd8c2b 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = regtest
+MODULE = regtest.exe
APPMODE = gui
IMPORTS = advapi32 kernel32
diff --git a/programs/uninstaller/.cvsignore b/programs/uninstaller/.cvsignore
index bd46993..0fed056 100644
--- a/programs/uninstaller/.cvsignore
+++ b/programs/uninstaller/.cvsignore
@@ -1,5 +1,4 @@
Makefile
rsrc.res
-uninstaller
-uninstaller.dbg.c
-uninstaller.spec.c
+uninstaller.exe.dbg.c
+uninstaller.exe.spec.c
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index b2d6d5f..9f84dc0 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = uninstaller
+MODULE = uninstaller.exe
APPMODE = gui
IMPORTS = user32 gdi32 advapi32 kernel32
diff --git a/programs/view/.cvsignore b/programs/view/.cvsignore
index 4543de0..5eb9fef 100644
--- a/programs/view/.cvsignore
+++ b/programs/view/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-view
-view.dbg.c
-view.spec.c
+view.exe.dbg.c
+view.exe.spec.c
viewrc.res
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index 9296945..5ef4ee1 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = view
+MODULE = view.exe
APPMODE = gui
IMPORTS = comdlg32 user32 gdi32 kernel32
diff --git a/programs/wcmd/.cvsignore b/programs/wcmd/.cvsignore
index 997f434..bea12d8 100644
--- a/programs/wcmd/.cvsignore
+++ b/programs/wcmd/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-wcmd
-wcmd.dbg.c
-wcmd.spec.c
+wcmd.exe.dbg.c
+wcmd.exe.spec.c
wcmdrc.res
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 0b2442b..605905f 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = wcmd
+MODULE = wcmd.exe
APPMODE = cui
IMPORTS = shell32 user32 kernel32
diff --git a/programs/wineconsole/.cvsignore b/programs/wineconsole/.cvsignore
index d20ecf1..c5b784c 100644
--- a/programs/wineconsole/.cvsignore
+++ b/programs/wineconsole/.cvsignore
@@ -1,5 +1,4 @@
Makefile
-wineconsole
-wineconsole.dbg.c
-wineconsole.spec.c
+wineconsole.exe.dbg.c
+wineconsole.exe.spec.c
wineconsole_res.res
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in
index b9916f4..610eb95 100644
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@@ -3,7 +3,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = wineconsole
+MODULE = wineconsole.exe
APPMODE = gui
IMPORTS = gdi32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32
diff --git a/programs/winemine/.cvsignore b/programs/winemine/.cvsignore
index 2e6b092..f289901 100644
--- a/programs/winemine/.cvsignore
+++ b/programs/winemine/.cvsignore
@@ -1,5 +1,4 @@
Makefile
rsrc.res
-winemine
-winemine.dbg.c
-winemine.spec.c
+winemine.exe.dbg.c
+winemine.exe.spec.c
diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in
index eaf951f..94a2cdd 100644
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = winemine
+MODULE = winemine.exe
APPMODE = gui
IMPORTS = user32 gdi32 advapi32 kernel32
diff --git a/programs/winepath/.cvsignore b/programs/winepath/.cvsignore
index 24c02ce..ab64e55 100644
--- a/programs/winepath/.cvsignore
+++ b/programs/winepath/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-winepath
-winepath.dbg.c
-winepath.spec.c
+winepath.exe.dbg.c
+winepath.exe.spec.c
diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in
index 814b6be..e2286ee 100644
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = winepath
+MODULE = winepath.exe
APPMODE = cui
IMPORTS = kernel32
diff --git a/programs/winetest/.cvsignore b/programs/winetest/.cvsignore
index 3ebb0b7..7b49ce5 100644
--- a/programs/winetest/.cvsignore
+++ b/programs/winetest/.cvsignore
@@ -1,4 +1,4 @@
Makefile
wine.c
-winetest.dbg.c
-winetest.spec.c
+winetest.exe.dbg.c
+winetest.exe.spec.c
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 520c2d7..6ac52dd 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -6,7 +6,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = winetest
+MODULE = winetest.exe
APPMODE = cui
IMPORTS = kernel32
diff --git a/programs/winhelp/.cvsignore b/programs/winhelp/.cvsignore
index 5984385..17dde50 100644
--- a/programs/winhelp/.cvsignore
+++ b/programs/winhelp/.cvsignore
@@ -2,8 +2,7 @@
hlp2sgml
lex.yy.c
rsrc.res
-winhelp
-winhelp.dbg.c
-winhelp.spec.c
+winhelp.exe.dbg.c
+winhelp.exe.spec.c
y.tab.c
y.tab.h
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index d4e2076..5b263b8 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = winhelp
+MODULE = winhelp.exe
APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32
PROGRAMS = hlp2sgml
diff --git a/programs/winver/.cvsignore b/programs/winver/.cvsignore
index 72f1115..99f465e 100644
--- a/programs/winver/.cvsignore
+++ b/programs/winver/.cvsignore
@@ -1,4 +1,3 @@
Makefile
-winver
-winver.dbg.c
-winver.spec.c
+winver.exe.dbg.c
+winver.exe.spec.c
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index d3e8be1..651a528 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -2,7 +2,7 @@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
-MODULE = winver
+MODULE = winver.exe
APPMODE = gui
IMPORTS = shell32 kernel32
