Robert de Bath's Big Patch, part 1

[u/mdw/putty] / Makefile

diff --git a/Makefile b/Makefile
index c54c5ba..dd7b067 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,13 @@
 ##--
 
 CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd
+# LFLAGS = /debug
+
+# Use MSVC DLL
+# CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /MD /Fd
+
+# Disable debug and incremental linking
+LFLAGS = /incremental:no
 
 .c.obj:
        cl $(COMPAT) $(FWHACK) $(CFLAGS) /c $*.c
@@ -45,7 +52,7 @@ POBJS = ssh.$(OBJ) be_all.$(OBJ)
 ##-- objects puttytel
 TOBJS = be_nossh.$(OBJ)
 ##-- objects pscp
-SOBJS = scp.$(OBJ) windlg.$(OBJ) scpssh.$(OBJ) be_none.$(OBJ)
+SOBJS = scp.$(OBJ) windlg.$(OBJ) ssh.$(OBJ) be_none.$(OBJ)
 ##-- objects putty puttytel pscp
 MOBJS = misc.$(OBJ) version.$(OBJ)
 ##-- objects putty pscp
@@ -54,7 +61,7 @@ OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ)
 ##-- resources putty
 PRESRC = win_res.$(RES)
 ##-- resources puttytel
-TRESRC = nossh_res.$(RES)
+TRESRC = nosshres.$(RES)
 ##-- resources pscp
 SRESRC = scp.$(RES)
 ##--
@@ -72,13 +79,13 @@ LIBS2 = wsock32.lib comctl32.lib comdlg32.lib
 all: putty.exe puttytel.exe pscp.exe
 
 putty.exe: $(GOBJS1) $(GOBJS2) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(PRESRC) putty.rsp
-       link /debug -out:putty.exe @putty.rsp
+       link $(LFLAGS) -out:putty.exe @putty.rsp
 
-puttytel.exe: $(GOBJS1) $(GOBJS2) $(TOBJS) $(MOBJS) $(PRESRC) puttytel.rsp
-       link /debug -out:puttytel.exe @puttytel.rsp
+puttytel.exe: $(GOBJS1) $(GOBJS2) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
+       link $(LFLAGS) -out:puttytel.exe @puttytel.rsp
 
-pscp.exe: $(SOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
-       link /debug -out:pscp.exe @pscp.rsp
+pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
+       link $(LFLAGS) -out:pscp.exe @pscp.rsp
 
 putty.rsp: makefile
        echo /nologo /subsystem:windows > putty.rsp
@@ -132,7 +139,6 @@ sshsha.$(OBJ): sshsha.c ssh.h
 sshrand.$(OBJ): sshrand.c ssh.h
 sshblowf.$(OBJ): sshblowf.c ssh.h
 scp.$(OBJ): scp.c putty.h scp.h
-scpssh.$(OBJ): scpssh.c putty.h ssh.h scp.h
 version.$(OBJ): version.c
 be_all.$(OBJ): be_all.c
 be_nossh.$(OBJ): be_nossh.c
@@ -152,10 +158,10 @@ win_res.$(RES):
        rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
 
 ##-- dependencies
-nossh_res.$(RES): nossh_res.rc win_res.h putty.ico
+nosshres.$(RES): nosshres.rc win_res.rc win_res.h putty.ico
 ##--
-nossh_res.$(RES):
-       rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 nossh_res.rc
+nosshres.$(RES):
+       rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 nosshres.rc
 
 ##-- dependencies
 scp.$(RES): scp.rc scp.ico