Pageant interface changes. You can now do `pageant -c command' to

[u/mdw/putty] / Makefile

diff --git a/Makefile b/Makefile
index 264ce08..9ff9aec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,15 +83,16 @@ MOBJ2 = tree234.$(OBJ)
 OBJS1 = sshcrc.$(OBJ) sshdes.$(OBJ) sshmd5.$(OBJ) sshrsa.$(OBJ) sshrand.$(OBJ)
 OBJS2 = sshsha.$(OBJ) sshblowf.$(OBJ) noise.$(OBJ) sshdh.$(OBJ) sshdss.$(OBJ)
 OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) sshzlib.$(OBJ)
-OBJS4 = x11fwd.$(OBJ)
+OBJS4 = x11fwd.$(OBJ) sshaes.$(OBJ)
 ##-- objects pageant
 PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ)
-PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ) misc.$(OBJ)
+PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ) misc.$(OBJ) sshaes.$(OBJ)
+PAGE3 = sshsha.$(OBJ) pageantc.$(OBJ)
 ##-- objects puttygen
 GEN1 = puttygen.$(OBJ) sshrsag.$(OBJ) sshprime.$(OBJ) sshdes.$(OBJ)
 GEN2 = sshbn.$(OBJ) sshmd5.$(OBJ) version.$(OBJ) sshrand.$(OBJ) noise.$(OBJ)
 GEN3 = sshsha.$(OBJ) winstore.$(OBJ) misc.$(OBJ) winctrls.$(OBJ)
-GEN4 = sshrsa.$(OBJ) sshpubk.$(OBJ)
+GEN4 = sshrsa.$(OBJ) sshpubk.$(OBJ) sshaes.$(OBJ)
 ##-- resources putty puttytel
 PRESRC = win_res.$(RES)
 ##-- resources pageant
@@ -130,7 +131,7 @@ putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(O
 puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(MOBJ2) $(PRESRC) puttytel.rsp
        link $(LFLAGS) -out:puttytel.exe -map:puttytel.map @puttytel.rsp
 
-pageant.exe: $(PAGE1) $(PAGE2) $(PAGERC) pageant.rsp
+pageant.exe: $(PAGE1) $(PAGE2) $(PAGE3) $(PAGERC) pageant.rsp
        link $(LFLAGS) -out:pageant.exe -map:pageant.map @pageant.rsp
 
 puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp
@@ -160,6 +161,7 @@ putty.rsp: makefile
        echo $(PRESRC) >> putty.rsp
        echo $(LIBS1) >> putty.rsp
        echo $(LIBS2) >> putty.rsp
+       echo $(LIBS3) >> putty.rsp
        echo $(SOCK1) >> putty.rsp
 
 puttytel.rsp: makefile
@@ -173,12 +175,14 @@ puttytel.rsp: makefile
        echo $(PRESRC) >> puttytel.rsp
        echo $(LIBS1) >> puttytel.rsp
        echo $(LIBS2) >> puttytel.rsp
+       echo $(LIBS3) >> puttytel.rsp
        echo $(SOCK1) >> puttytel.rsp
 
 pageant.rsp: makefile
        echo /nologo /subsystem:windows > pageant.rsp
        echo $(PAGE1) >> pageant.rsp
        echo $(PAGE2) >> pageant.rsp
+       echo $(PAGE3) >> pageant.rsp
        echo $(PAGERC) >> pageant.rsp
        echo $(LIBS1) >> pageant.rsp
        echo $(LIBS2) >> pageant.rsp
@@ -257,6 +261,7 @@ noise.$(OBJ): noise.c putty.h puttymem.h network.h ssh.h storage.h
 ssh.$(OBJ): ssh.c ssh.h putty.h puttymem.h network.h tree234.h
 sshcrc.$(OBJ): sshcrc.c ssh.h puttymem.h
 sshdes.$(OBJ): sshdes.c ssh.h puttymem.h
+sshaes.$(OBJ): sshaes.c ssh.h puttymem.h
 sshmd5.$(OBJ): sshmd5.c ssh.h puttymem.h
 sshrsa.$(OBJ): sshrsa.c ssh.h puttymem.h
 sshsha.$(OBJ): sshsha.c ssh.h puttymem.h
@@ -278,8 +283,9 @@ pageantc.$(OBJ): pageantc.c puttymem.h
 tree234.$(OBJ): tree234.c tree234.h puttymem.h
 puttygen.$(OBJ): puttygen.c putty.h ssh.h winstuff.h
 psftp.$(OBJ): psftp.c putty.h ssh.h storage.h sftp.h int64.h
-sftp.$(OBJ): psftp.c sftp.h int64.h
+sftp.$(OBJ): sftp.c sftp.h int64.h
 int64.$(OBJ): int64.c int64.h
+x11fwd.$(OBJ): x11fwd.c putty.h network.h puttymem.h ssh.h
 ##--
 
 # Hack to force version.obj to be rebuilt always