X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0ac99c2fd7ca102e601f24b21d6fb7caf9dc703b..4017be6d5375063f59b63474490ac072e7f09b1a:/Makefile

diff --git a/Makefile b/Makefile
index d7af9be9..3b134914 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ 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 /ML /Fd
+# CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /MD /Fd
 
 # Disable debug and incremental linking
 LFLAGS = /incremental:no
@@ -45,25 +45,32 @@ OBJ=obj
 RES=res
 
 ##-- objects putty puttytel
-GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ) telnet.$(OBJ) raw.$(OBJ)
-GOBJS2 = xlat.$(OBJ) ldisc.$(OBJ) sizetip.$(OBJ)
-##-- objects putty
+GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ)
+GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
+##-- objects putty puttytel plink
+LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
+##-- objects putty plink
 POBJS = ssh.$(OBJ) be_all.$(OBJ)
 ##-- objects puttytel
 TOBJS = be_nossh.$(OBJ)
+##-- objects plink
+PLOBJS = plink.$(OBJ) windlg.$(OBJ)
 ##-- objects pscp
-SOBJS = scp.$(OBJ) windlg.$(OBJ) scpssh.$(OBJ) be_none.$(OBJ)
-##-- objects putty puttytel pscp
+SOBJS = scp.$(OBJ) windlg.$(OBJ) ssh.$(OBJ) be_none.$(OBJ)
+##-- objects putty puttytel pscp plink
 MOBJS = misc.$(OBJ) version.$(OBJ)
-##-- objects putty pscp
+##-- objects putty pscp plink
 OBJS1 = sshcrc.$(OBJ) sshdes.$(OBJ) sshmd5.$(OBJ) sshrsa.$(OBJ) sshrand.$(OBJ)
-OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ)
+OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ) sshdh.$(OBJ) sshdss.$(OBJ)
+OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ)
 ##-- resources putty
 PRESRC = win_res.$(RES)
 ##-- resources puttytel
 TRESRC = nosshres.$(RES)
 ##-- resources pscp
 SRESRC = scp.$(RES)
+##-- resources plink
+LRESRC = plink.$(RES)
 ##--
 
 ##-- gui-apps
@@ -74,40 +81,50 @@ SRESRC = scp.$(RES)
 ##--
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib
-LIBS2 = wsock32.lib comctl32.lib comdlg32.lib
+LIBS2 = comctl32.lib comdlg32.lib
+SOCK1 = wsock32.lib
+SOCK2 = ws2_32.lib
 
-all: putty.exe puttytel.exe pscp.exe
+all: putty.exe puttytel.exe pscp.exe plink.exe
 
-putty.exe: $(GOBJS1) $(GOBJS2) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(PRESRC) putty.rsp
+putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
 	link $(LFLAGS) -out:putty.exe @putty.rsp
 
-puttytel.exe: $(GOBJS1) $(GOBJS2) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
+puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
 	link $(LFLAGS) -out:puttytel.exe @puttytel.rsp
 
 pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
 	link $(LFLAGS) -out:pscp.exe @pscp.rsp
 
+plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(LRESRC) plink.rsp
+	link $(LFLAGS) -out:plink.exe @plink.rsp
+
 putty.rsp: makefile
 	echo /nologo /subsystem:windows > putty.rsp
 	echo $(GOBJS1) >> putty.rsp
 	echo $(GOBJS2) >> putty.rsp
+	echo $(LOBJS1) >> putty.rsp
 	echo $(POBJS) >> putty.rsp
 	echo $(MOBJS) >> putty.rsp
 	echo $(OBJS1) >> putty.rsp
 	echo $(OBJS2) >> putty.rsp
+	echo $(OBJS3) >> putty.rsp
 	echo $(PRESRC) >> putty.rsp
 	echo $(LIBS1) >> putty.rsp
 	echo $(LIBS2) >> putty.rsp
+	echo $(SOCK1) >> putty.rsp
 
 puttytel.rsp: makefile
 	echo /nologo /subsystem:windows > puttytel.rsp
 	echo $(GOBJS1) >> puttytel.rsp
 	echo $(GOBJS2) >> puttytel.rsp
+	echo $(LOBJS1) >> puttytel.rsp
 	echo $(TOBJS) >> puttytel.rsp
 	echo $(MOBJS) >> puttytel.rsp
 	echo $(TRESRC) >> puttytel.rsp
 	echo $(LIBS1) >> puttytel.rsp
 	echo $(LIBS2) >> puttytel.rsp
+	echo $(SOCK1) >> puttytel.rsp
 
 pscp.rsp: makefile
 	echo /nologo /subsystem:console > pscp.rsp
@@ -115,9 +132,25 @@ pscp.rsp: makefile
 	echo $(MOBJS) >> pscp.rsp
 	echo $(OBJS1) >> pscp.rsp
 	echo $(OBJS2) >> pscp.rsp
+	echo $(OBJS3) >> pscp.rsp
 	echo $(SRESRC) >> pscp.rsp
 	echo $(LIBS1) >> pscp.rsp
 	echo $(LIBS2) >> pscp.rsp
+	echo $(SOCK1) >> pscp.rsp
+
+plink.rsp: makefile
+	echo /nologo /subsystem:console > plink.rsp
+	echo $(LOBJS1) >> plink.rsp
+	echo $(POBJS) >> plink.rsp
+	echo $(PLOBJS) >> plink.rsp
+	echo $(MOBJS) >> plink.rsp
+	echo $(OBJS1) >> plink.rsp
+	echo $(OBJS2) >> plink.rsp
+	echo $(OBJS3) >> plink.rsp
+	echo $(LRESRC) >> plink.rsp
+	echo $(LIBS1) >> plink.rsp
+ 	echo $(LIBS2) >> plink.rsp
+ 	echo $(SOCK2) >> plink.rsp
 
 ##-- dependencies
 window.$(OBJ): window.c putty.h win_res.h
@@ -138,12 +171,16 @@ sshrsa.$(OBJ): sshrsa.c ssh.h
 sshsha.$(OBJ): sshsha.c ssh.h
 sshrand.$(OBJ): sshrand.c ssh.h
 sshblowf.$(OBJ): sshblowf.c ssh.h
+sshdh.$(OBJ): sshdh.c ssh.h
+sshdss.$(OBJ): sshdss.c ssh.h
+sshbn.$(OBJ): sshbn.c ssh.h
+sshpubk.$(OBJ): sshpubk.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
 be_none.$(OBJ): be_none.c
+plink.$(OBJ): plink.c putty.h
 ##--
 
 # Hack to force version.obj to be rebuilt always