X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a9422f39e34f55d1925d1ebef35ace1a0f1c2f6a..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/Makefile

diff --git a/Makefile b/Makefile
index 731cf5df..4e20f611 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ OBJ=obj
 RES=res
 
 ##-- objects putty puttytel
-GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ)
+GOBJS1 = window.$(OBJ) windlg.$(OBJ) winctrls.$(OBJ) terminal.$(OBJ)
 GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
 ##-- objects putty puttytel plink
 LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
@@ -72,10 +72,17 @@ OBJS3 = sshbn.$(OBJ) sshpubk.$(OBJ) ssh.$(OBJ) pageantc.$(OBJ) tree234.$(OBJ)
 ##-- objects pageant
 PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ)
 PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(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)
 ##-- resources putty puttytel
 PRESRC = win_res.$(RES)
 ##-- resources pageant
 PAGERC = pageant.$(RES)
+##-- resources puttygen
+GENRC = puttygen.$(RES)
 ##-- resources pscp
 SRESRC = scp.$(RES)
 ##-- resources plink
@@ -86,9 +93,10 @@ LRESRC = plink.$(RES)
 # putty
 # puttytel
 # pageant
+# puttygen
 ##-- console-apps
 # pscp
-# plink
+# plink ws2_32
 ##--
 
 LIBS1 = advapi32.lib user32.lib gdi32.lib
@@ -97,7 +105,7 @@ LIBS3 = shell32.lib
 SOCK1 = wsock32.lib
 SOCK2 = ws2_32.lib
 
-all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe
+all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe puttygen.exe
 
 putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
 	link $(LFLAGS) -out:putty.exe @putty.rsp
@@ -108,6 +116,9 @@ puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(PRESRC) puttytel
 pageant.exe: $(PAGE1) $(PAGE2) $(PAGERC) pageant.rsp
 	link $(LFLAGS) -out:pageant.exe @pageant.rsp
 
+puttygen.exe: $(GEN1) $(GEN2) $(GEN3) $(GEN4) $(GENRC) puttygen.rsp
+	link $(LFLAGS) -out:puttygen.exe @puttygen.rsp
+
 pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
 	link $(LFLAGS) -out:pscp.exe @pscp.rsp
 
@@ -143,13 +154,24 @@ puttytel.rsp: makefile
 
 pageant.rsp: makefile
 	echo /nologo /subsystem:windows > pageant.rsp
-        echo $(PAGE1) >> pageant.rsp
-        echo $(PAGE2) >> pageant.rsp
-        echo $(PAGERC) >> pageant.rsp
+	echo $(PAGE1) >> pageant.rsp
+	echo $(PAGE2) >> pageant.rsp
+	echo $(PAGERC) >> pageant.rsp
 	echo $(LIBS1) >> pageant.rsp
 	echo $(LIBS2) >> pageant.rsp
 	echo $(LIBS3) >> pageant.rsp
 
+puttygen.rsp: makefile
+	echo /nologo /subsystem:windows > puttygen.rsp
+	echo $(GEN1) >> puttygen.rsp
+	echo $(GEN2) >> puttygen.rsp
+	echo $(GEN3) >> puttygen.rsp
+	echo $(GEN4) >> puttygen.rsp
+	echo $(GENRC) >> puttygen.rsp
+	echo $(LIBS1) >> puttygen.rsp
+	echo $(LIBS2) >> puttygen.rsp
+	echo $(LIBS3) >> puttygen.rsp
+
 pscp.rsp: makefile
 	echo /nologo /subsystem:console > pscp.rsp
 	echo $(SOBJS) >> pscp.rsp
@@ -177,12 +199,13 @@ plink.rsp: makefile
  	echo $(SOCK2) >> plink.rsp
 
 ##-- dependencies
-window.$(OBJ): window.c putty.h win_res.h storage.h
-windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h
+window.$(OBJ): window.c putty.h win_res.h storage.h winstuff.h
+windlg.$(OBJ): windlg.c putty.h ssh.h win_res.h winstuff.h
+winctrls.$(OBJ): winctrls.c winstuff.h winstuff.h
 settings.$(OBJ): settings.c putty.h storage.h
 winstore.$(OBJ): winstore.c putty.h storage.h
 terminal.$(OBJ): terminal.c putty.h
-sizetip.$(OBJ): sizetip.c putty.h
+sizetip.$(OBJ): sizetip.c putty.h winstuff.h
 telnet.$(OBJ): telnet.c putty.h
 raw.$(OBJ): raw.c putty.h
 xlat.$(OBJ): xlat.c putty.h
@@ -201,12 +224,12 @@ sshdh.$(OBJ): sshdh.c ssh.h
 sshdss.$(OBJ): sshdss.c ssh.h
 sshbn.$(OBJ): sshbn.c ssh.h
 sshpubk.$(OBJ): sshpubk.c ssh.h
-scp.$(OBJ): scp.c putty.h
+scp.$(OBJ): scp.c putty.h winstuff.h
 version.$(OBJ): version.c
 be_all.$(OBJ): be_all.c
 be_nossh.$(OBJ): be_nossh.c
 be_none.$(OBJ): be_none.c
-plink.$(OBJ): plink.c putty.h
+plink.$(OBJ): plink.c putty.h winstuff.h
 pageant.$(OBJ): pageant.c ssh.h tree234.h
 tree234.$(OBJ): tree234.c tree234.h
 ##--
@@ -235,6 +258,12 @@ pageant.$(RES): pageant.rc pageant.ico pageants.ico
 pageant.$(RES):
 	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 pageant.rc
 
+##-- dependencies
+puttygen.$(RES): puttygen.rc puttygen.ico
+##--
+puttygen.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 puttygen.rc
+
 clean:
 	del *.obj
 	del *.exe