X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/9a3a93a5c6a879994d61da8a146142a6555fd5d0..8eebd22198133e95ce25af1dd15dead0a5389371:/Makefile

diff --git a/Makefile b/Makefile
index 6ae9268b..d095aee0 100644
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,9 @@ RES=res
 ##-- objects putty puttytel
 GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ)
 GOBJS2 = sizetip.$(OBJ) wcwidth.$(OBJ) unicode.$(OBJ) logging.$(OBJ)
+GOBJS3 = printing.$(OBJ)
 ##-- objects putty puttytel plink
-LOBJS1 = telnet.$(OBJ) raw.$(OBJ) rlogin.$(OBJ) ldisc.$(OBJ) winnet.$(OBJ)
+LOBJS1 = telnet.$(OBJ) raw.$(OBJ) rlogin.$(OBJ) ldisc.$(OBJ) winnet.$(OBJ) proxy.$(OBJ)
 ##-- objects putty plink
 POBJS = be_all.$(OBJ)
 ##-- objects puttytel
@@ -103,9 +104,9 @@ TOBJS = be_nossh.$(OBJ)
 ##-- objects plink
 PLOBJS = plink.$(OBJ) logging.$(OBJ)
 ##-- objects pscp
-SOBJS = scp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ) wildcard.$(OBJ)
+SOBJS = scp.$(OBJ) winnet.$(OBJ) proxy.$(OBJ) be_none.$(OBJ) wildcard.$(OBJ)
 ##-- objects psftp
-FOBJS = psftp.$(OBJ) winnet.$(OBJ) be_none.$(OBJ)
+FOBJS = psftp.$(OBJ) winnet.$(OBJ) proxy.$(OBJ) be_none.$(OBJ)
 ##-- objects pscp psftp
 SFOBJS = sftp.$(OBJ) int64.$(OBJ) logging.$(OBJ)
 ##-- objects putty puttytel pscp psftp plink
@@ -152,17 +153,17 @@ LRESRC = plink.$(RES)
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib
 LIBS2 = comctl32.lib comdlg32.lib
-LIBS3 = shell32.lib winmm.lib imm32.lib
+LIBS3 = shell32.lib winmm.lib imm32.lib winspool.lib
 SOCK1 = wsock32.lib
 SOCK2 = ws2_32.lib
 
 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
+putty.exe: $(GOBJS1) $(GOBJS2) $(GOBJS3) $(LOBJS1) $(POBJS) $(MOBJS) $(MOBJ2) $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(PRESRC) putty.rsp
 	link $(LFLAGS) -out:putty.exe -map:putty.map @putty.rsp
 
-puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(MOBJ2) $(PRESRC) puttytel.rsp
+puttytel.exe: $(GOBJS1) $(GOBJS2) $(GOBJS3) $(LOBJS1) $(TOBJS) $(MOBJS) $(MOBJ2) $(PRESRC) puttytel.rsp
 	link $(LFLAGS) -out:puttytel.exe -map:puttytel.map @puttytel.rsp
 
 pageant.exe: $(PAGE1) $(PAGE2) $(PAGE3) $(PAGERC) pageant.rsp
@@ -187,6 +188,7 @@ putty.rsp: makefile
 	echo /nologo /subsystem:windows > putty.rsp
 	echo $(GOBJS1) >> putty.rsp
 	echo $(GOBJS2) >> putty.rsp
+	echo $(GOBJS3) >> putty.rsp
 	echo $(LOBJS1) >> putty.rsp
 	echo $(POBJS) >> putty.rsp
 	echo $(MOBJS) >> putty.rsp
@@ -205,6 +207,7 @@ puttytel.rsp: makefile
 	echo /nologo /subsystem:windows > puttytel.rsp
 	echo $(GOBJS1) >> puttytel.rsp
 	echo $(GOBJS2) >> puttytel.rsp
+	echo $(GOBJS3) >> puttytel.rsp
 	echo $(LOBJS1) >> puttytel.rsp
 	echo $(TOBJS) >> puttytel.rsp
 	echo $(MOBJS) >> puttytel.rsp
@@ -289,61 +292,58 @@ plink.rsp: makefile
 be_all.$(OBJ): be_all.c network.h misc.h puttymem.h putty.h 
 be_none.$(OBJ): be_none.c network.h misc.h puttymem.h putty.h 
 be_nossh.$(OBJ): be_nossh.c network.h misc.h puttymem.h putty.h 
-ber.$(OBJ): ber.c network.h asn.h misc.h asnerror.h int64.h puttymem.h ssh.h putty.h 
-cert.$(OBJ): cert.c asn.h asnerror.h misc.h puttymem.h cert.h crypto.h 
-debug.$(OBJ): debug.c debug.h 
+console.$(OBJ): console.c network.h misc.h puttymem.h int64.h storage.h ssh.h putty.h 
 int64.$(OBJ): int64.c int64.h 
 ldisc.$(OBJ): ldisc.c network.h misc.h puttymem.h putty.h 
+logging.$(OBJ): logging.c network.h misc.h puttymem.h putty.h 
 misc.$(OBJ): misc.c network.h misc.h puttymem.h putty.h 
-mscrypto.$(OBJ): mscrypto.c network.h int64.h puttymem.h ssh.h 
-no_ssl.$(OBJ): no_ssl.c network.h misc.h puttymem.h putty.h 
-noise.$(OBJ): noise.c network.h misc.h puttymem.h storage.h int64.h ssh.h putty.h 
-pageant.$(OBJ): pageant.c network.h int64.h puttymem.h ssh.h tree234.h 
+noise.$(OBJ): noise.c network.h misc.h puttymem.h int64.h storage.h ssh.h putty.h 
+pageant.$(OBJ): pageant.c network.h misc.h int64.h puttymem.h ssh.h tree234.h 
 pageantc.$(OBJ): pageantc.c puttymem.h 
 plink.$(OBJ): plink.c network.h misc.h puttymem.h storage.h putty.h tree234.h 
-portfwd.$(OBJ): portfwd.c network.h misc.h int64.h puttymem.h ssh.h putty.h 
-psftp.$(OBJ): psftp.c network.h misc.h sftp.h ssh.h storage.h int64.h puttymem.h putty.h 
-puttygen.$(OBJ): puttygen.c network.h misc.h int64.h puttymem.h winstuff.h ssh.h putty.h 
+portfwd.$(OBJ): portfwd.c network.h misc.h puttymem.h int64.h ssh.h putty.h 
+printing.$(OBJ): printing.c network.h misc.h puttymem.h putty.h 
+proxy.$(OBJ): proxy.c proxy.h network.h 
+psftp.$(OBJ): psftp.c network.h misc.h sftp.h ssh.h storage.h int64.h puttymem.h putty.h
+puttygen.$(OBJ): puttygen.c network.h misc.h puttymem.h int64.h winstuff.h ssh.h putty.h 
 raw.$(OBJ): raw.c network.h misc.h puttymem.h putty.h 
 rlogin.$(OBJ): rlogin.c network.h misc.h puttymem.h putty.h 
-scp.$(OBJ): scp.c network.h misc.h sftp.h ssh.h storage.h puttymem.h int64.h putty.h winstuff.h 
+scp.$(OBJ): scp.c network.h misc.h sftp.h ssh.h storage.h int64.h puttymem.h putty.h winstuff.h 
 settings.$(OBJ): settings.c network.h misc.h puttymem.h storage.h putty.h 
-sftp.$(OBJ): sftp.c sftp.h int64.h 
+sftp.$(OBJ): sftp.c misc.h puttymem.h sftp.h int64.h 
 sizetip.$(OBJ): sizetip.c network.h misc.h puttymem.h winstuff.h putty.h 
-ssh.$(OBJ): ssh.c network.h misc.h int64.h puttymem.h ssh.h putty.h tree234.h 
-sshaes.$(OBJ): sshaes.c network.h int64.h puttymem.h ssh.h 
-sshblowf.$(OBJ): sshblowf.c network.h int64.h puttymem.h ssh.h 
-sshbn.$(OBJ): sshbn.c network.h misc.h int64.h puttymem.h ssh.h putty.h 
+ssh.$(OBJ): ssh.c network.h misc.h puttymem.h int64.h ssh.h putty.h tree234.h 
+sshaes.$(OBJ): sshaes.c network.h puttymem.h int64.h ssh.h 
+sshblowf.$(OBJ): sshblowf.c network.h puttymem.h int64.h ssh.h 
+sshbn.$(OBJ): sshbn.c network.h misc.h int64.h puttymem.h ssh.h 
 sshcrc.$(OBJ): sshcrc.c 
-sshdes.$(OBJ): sshdes.c network.h int64.h puttymem.h ssh.h 
-sshdh.$(OBJ): sshdh.c network.h int64.h puttymem.h ssh.h 
+sshcrcda.$(OBJ): sshcrcda.c network.h misc.h int64.h puttymem.h ssh.h 
+sshdes.$(OBJ): sshdes.c network.h puttymem.h int64.h ssh.h 
+sshdh.$(OBJ): sshdh.c network.h puttymem.h int64.h ssh.h 
 sshdss.$(OBJ): sshdss.c network.h misc.h int64.h puttymem.h ssh.h 
 sshdssg.$(OBJ): sshdssg.c network.h misc.h int64.h puttymem.h ssh.h 
-sshmd5.$(OBJ): sshmd5.c network.h int64.h puttymem.h ssh.h 
-sshprime.$(OBJ): sshprime.c network.h int64.h puttymem.h ssh.h 
-sshpubk.$(OBJ): sshpubk.c network.h int64.h puttymem.h ssh.h 
-sshrand.$(OBJ): sshrand.c network.h int64.h puttymem.h ssh.h 
-sshrsa.$(OBJ): sshrsa.c network.h int64.h puttymem.h ssh.h 
-sshrsag.$(OBJ): sshrsag.c network.h int64.h puttymem.h ssh.h 
-sshsh512.$(OBJ): sshsh512.c network.h int64.h puttymem.h ssh.h 
-sshsha.$(OBJ): sshsha.c network.h int64.h puttymem.h ssh.h 
-sshzlib.$(OBJ): sshzlib.c network.h int64.h puttymem.h ssh.h 
-ssl.$(OBJ): ssl.c network.h asnerror.h misc.h cert.h crypto.h ssl.h int64.h puttymem.h 
+sshmd5.$(OBJ): sshmd5.c network.h puttymem.h int64.h ssh.h 
+sshprime.$(OBJ): sshprime.c network.h puttymem.h int64.h ssh.h 
+sshpubk.$(OBJ): sshpubk.c network.h misc.h int64.h puttymem.h ssh.h 
+sshrand.$(OBJ): sshrand.c network.h puttymem.h int64.h ssh.h 
+sshrsa.$(OBJ): sshrsa.c network.h misc.h int64.h puttymem.h ssh.h 
+sshrsag.$(OBJ): sshrsag.c network.h puttymem.h int64.h ssh.h 
+sshsh512.$(OBJ): sshsh512.c network.h puttymem.h int64.h ssh.h 
+sshsha.$(OBJ): sshsha.c network.h puttymem.h int64.h ssh.h 
+sshzlib.$(OBJ): sshzlib.c network.h puttymem.h int64.h ssh.h 
 telnet.$(OBJ): telnet.c network.h misc.h puttymem.h putty.h 
 terminal.$(OBJ): terminal.c network.h misc.h puttymem.h putty.h tree234.h 
-logging.$(OBJ): logging.c misc.h puttymem.h putty.h
-test.$(OBJ): test.c network.h int64.h puttymem.h ssh.h 
 tree234.$(OBJ): tree234.c tree234.h 
 unicode.$(OBJ): unicode.c network.h misc.h puttymem.h putty.h 
 version.$(OBJ): version.c 
 wcwidth.$(OBJ): wcwidth.c 
 wildcard.$(OBJ): wildcard.c 
 winctrls.$(OBJ): winctrls.c network.h misc.h puttymem.h putty.h winstuff.h 
-windlg.$(OBJ): windlg.c network.h misc.h ssh.h storage.h puttymem.h int64.h putty.h winstuff.h win_res.h 
+windlg.$(OBJ): windlg.c network.h misc.h ssh.h storage.h int64.h puttymem.h putty.h winstuff.h win_res.h 
 window.$(OBJ): window.c network.h misc.h puttymem.h storage.h winstuff.h putty.h win_res.h 
 winnet.$(OBJ): winnet.c network.h misc.h puttymem.h putty.h tree234.h 
 winstore.$(OBJ): winstore.c network.h misc.h puttymem.h storage.h putty.h 
-x11fwd.$(OBJ): x11fwd.c network.h misc.h int64.h puttymem.h ssh.h putty.h 
+x11fwd.$(OBJ): x11fwd.c network.h misc.h puttymem.h int64.h ssh.h putty.h 
 ##--
 
 # Hack to force version.obj to be rebuilt always