SSH 2 support, phase 1, debugging. Currently does Diffie-Hellman and gets

[u/mdw/putty] / Makefile

diff --git a/Makefile b/Makefile
index 54bf49e..dc671ff 100644 (file)
--- 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
@@ -52,16 +52,17 @@ 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
 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)
 ##-- resources putty
 PRESRC = win_res.$(RES)
 ##-- resources puttytel
-TRESRC = nossh_res.$(RES)
+TRESRC = nosshres.$(RES)
 ##-- resources pscp
 SRESRC = scp.$(RES)
 ##--
@@ -78,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
+putty.exe: $(GOBJS1) $(GOBJS2) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
        link $(LFLAGS) -out:putty.exe @putty.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
+pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
        link $(LFLAGS) -out:pscp.exe @pscp.rsp
 
 putty.rsp: makefile
@@ -95,6 +96,7 @@ putty.rsp: makefile
        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
@@ -115,6 +117,7 @@ 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
@@ -138,8 +141,10 @@ 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
 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
@@ -159,10 +164,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.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