Justin Bradford's proxy support patch. Currently supports only HTTP

[u/mdw/putty] / Makefile

diff --git a/Makefile b/Makefile
index 15a9b3b..d095aee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ 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
@@ -104,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
@@ -153,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
@@ -188,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
@@ -206,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
@@ -301,7 +303,8 @@ 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 puttymem.h int64.h ssh.h putty.h 
 printing.$(OBJ): printing.c network.h misc.h puttymem.h putty.h 
-psftp.$(OBJ): psftp.c network.h misc.h sftp.h ssh.h storage.h int64.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