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

[u/mdw/putty] / Makefile

diff --git a/Makefile b/Makefile
index e9fb759..9ff9aec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,29 +74,32 @@ TOBJS = be_nossh.$(OBJ)
 PLOBJS = plink.$(OBJ)
 ##-- objects pscp
 SOBJS = scp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
-##-- objects putty puttytel pscp plink
+##-- objects psftp
+FOBJS = psftp.$(OBJ) sftp.$(OBJ) int64.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
+##-- objects putty puttytel pscp psftp plink
 MOBJS = misc.$(OBJ) version.$(OBJ) winstore.$(OBJ) settings.$(OBJ)
 MOBJ2 = tree234.$(OBJ)
-##-- objects putty pscp plink
+##-- objects putty pscp psftp plink
 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
 PAGERC = pageant.$(RES)
 ##-- resources puttygen
 GENRC = puttygen.$(RES)
-##-- resources pscp
+##-- resources pscp psftp
 SRESRC = scp.$(RES)
 ##-- resources plink
 LRESRC = plink.$(RES)
@@ -109,6 +112,7 @@ LRESRC = plink.$(RES)
 # puttygen
 ##-- console-apps
 # pscp
+# psftp
 # plink ws2_32
 ##--
 
@@ -118,7 +122,8 @@ LIBS3 = shell32.lib
 SOCK1 = wsock32.lib
 SOCK2 = ws2_32.lib
 
-all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe puttygen.exe
+all: putty.exe puttytel.exe pscp.exe psftp.exe \
+     plink.exe pageant.exe puttygen.exe
 
 putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(PRESRC) putty.rsp
        link $(LFLAGS) -out:putty.exe -map:putty.map @putty.rsp
@@ -126,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
@@ -135,6 +140,9 @@ puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp
 pscp.exe: $(SOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) pscp.rsp
        link $(LFLAGS) -out:pscp.exe -map:pscp.map @pscp.rsp
 
+psftp.exe: $(FOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(SRESRC) psftp.rsp
+       link $(LFLAGS) -out:psftp.exe -map:psftp.map @psftp.rsp
+
 plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(LRESRC) plink.rsp
        link $(LFLAGS) -out:plink.exe -map:plink.map @plink.rsp
 
@@ -153,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
@@ -166,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
@@ -202,6 +213,20 @@ pscp.rsp: makefile
        echo $(LIBS2) >> pscp.rsp
        echo $(SOCK1) >> pscp.rsp
 
+psftp.rsp: makefile
+       echo /nologo /subsystem:console > psftp.rsp
+       echo $(FOBJS) >> psftp.rsp
+       echo $(MOBJS) >> psftp.rsp
+       echo $(MOBJ2) >> psftp.rsp
+       echo $(OBJS1) >> psftp.rsp
+       echo $(OBJS2) >> psftp.rsp
+       echo $(OBJS3) >> psftp.rsp
+       echo $(OBJS4) >> psftp.rsp
+       echo $(SRESRC) >> psftp.rsp
+       echo $(LIBS1) >> psftp.rsp
+       echo $(LIBS2) >> psftp.rsp
+       echo $(SOCK1) >> psftp.rsp
+
 plink.rsp: makefile
        echo /nologo /subsystem:console > plink.rsp
        echo $(LOBJS1) >> plink.rsp
@@ -236,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
@@ -256,6 +282,10 @@ pageant.$(OBJ): pageant.c ssh.h puttymem.h tree234.h
 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): 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