X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/14963b8ffdc189c7f1e0a5006a23ab5b01ae13d1..d5859615f641e5bbd853cd42aafd4fa577da17eb:/Makefile

diff --git a/Makefile b/Makefile
index 06765573..7d927203 100644
--- a/Makefile
+++ b/Makefile
@@ -1,91 +1,249 @@
-# Makefile for PuTTY. Use `FWHACK=/DFWHACK' to cause the firewall hack
-# to be built in. (requires rebuild of ssh.obj only)
+# Visual C++ Makefile for PuTTY.
+#
+# Use `nmake' to build.
+#
 
-# Can also build with `VER=/DSNAPSHOT=1999-01-25' or
-# `VER=/DRELEASE=0.43' to get version numbering; otherwise you'll
-# get `Unidentified build'.
-
-# COMPAT=/DWIN32S_COMPAT will produce a binary that works (minimally)
-# with Win32s
+##-- help
+#
+# Extra options you can set:
+#
+#  - FWHACK=/DFWHACK
+#      Enables a hack that tunnels through some firewall proxies.
+#
+#  - VER=/DSNAPSHOT=1999-01-25
+#      Generates executables whose About box report them as being a
+#      development snapshot.
+#
+#  - VER=/DRELEASE=0.43
+#      Generates executables whose About box report them as being a
+#      release version.
+#
+#  - COMPAT=/DWIN32S_COMPAT
+#      Generates a binary that works (minimally) with Win32s.
+#
+#  - COMPAT=/DAUTO_WINSOCK
+#      Causes PuTTY to assume that <windows.h> includes its own WinSock
+#      header file, so that it won't try to include <winsock.h>.
+#
+#  - COMPAT=/DWINSOCK_TWO
+#      Causes the PuTTY utilities to include <winsock2.h> instead of
+#      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
+#      does this.
+#
+#  - RCFL=/DASCIICTLS
+#      Uses ASCII rather than Unicode to specify the tab control in
+#      the resource file. Probably most useful when compiling with
+#      Cygnus/mingw32, whose resource compiler may have less of a
+#      problem with it.
+#
+##--
 
 CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd
+# LFLAGS = /debug
+
+# Use MSVC DLL
+# CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /MD /Fd
+
+# Disable debug and incremental linking
+LFLAGS = /incremental:no
 
 .c.obj:
 	cl $(COMPAT) $(FWHACK) $(CFLAGS) /c $*.c
 
-PUTTYOBJS = window.obj windlg.obj terminal.obj telnet.obj raw.obj xlat.obj
-OBJS1 = misc.obj noise.obj
-OBJS2 = ssh.obj sshcrc.obj sshdes.obj sshmd5.obj sshrsa.obj sshrand.obj
-OBJS3 = sshsha.obj sshblowf.obj version.obj sizetip.obj
-RESRC = win_res.res
+OBJ=obj
+RES=res
+
+##-- objects putty puttytel
+GOBJS1 = window.$(OBJ) windlg.$(OBJ) terminal.$(OBJ)
+GOBJS2 = xlat.$(OBJ) sizetip.$(OBJ)
+##-- objects putty puttytel plink
+LOBJS1 = telnet.$(OBJ) raw.$(OBJ) ldisc.$(OBJ)
+##-- objects putty plink
+POBJS = be_all.$(OBJ)
+##-- objects puttytel
+TOBJS = be_nossh.$(OBJ)
+##-- objects plink
+PLOBJS = plink.$(OBJ) windlg.$(OBJ)
+##-- objects pscp
+SOBJS = scp.$(OBJ) windlg.$(OBJ) be_none.$(OBJ)
+##-- objects putty puttytel pscp plink
+MOBJS = misc.$(OBJ) version.$(OBJ) winstore.$(OBJ)
+##-- objects putty pscp 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) tree234.$(OBJ)
+##-- objects pageant
+PAGE1 = pageant.$(OBJ) sshrsa.$(OBJ) sshpubk.$(OBJ) sshdes.$(OBJ) sshbn.$(OBJ)
+PAGE2 = sshmd5.$(OBJ) version.$(OBJ) tree234.$(OBJ)
+##-- resources putty
+PRESRC = win_res.$(RES)
+##-- resources puttytel
+TRESRC = nosshres.$(RES)
+##-- resources pageant
+PAGERC = pageant.$(RES)
+##-- resources pscp
+SRESRC = scp.$(RES)
+##-- resources plink
+LRESRC = plink.$(RES)
+##--
+
+##-- gui-apps
+# putty
+# puttytel
+# pageant
+##-- console-apps
+# pscp
+# plink
+##--
+
 LIBS1 = advapi32.lib user32.lib gdi32.lib
-LIBS2 = wsock32.lib comctl32.lib comdlg32.lib
-SCPOBJS = scp.obj windlg.obj misc.obj noise.obj 
-SCPOBJS2 = scpssh.obj sshcrc.obj sshdes.obj sshmd5.obj
-SCPOBJS3 = sshrsa.obj sshrand.obj sshsha.obj sshblowf.obj version.obj
-
-all: putty.exe pscp.exe
-
-putty.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
-	link /debug -out:putty.exe @link.rsp
-
-puttyd.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp
-	link /debug -out:puttyd.exe @link.rsp
-
-link.rsp: makefile
-	echo /nologo /subsystem:windows > link.rsp
-	echo $(PUTTYOBJS) >> link.rsp
-	echo $(OBJS1) >> link.rsp
-	echo $(OBJS2) >> link.rsp
-	echo $(OBJS3) >> link.rsp
-	echo $(RESRC) >> link.rsp
-	echo $(LIBS1) >> link.rsp
-	echo $(LIBS2) >> link.rsp
-
-window.obj: window.c putty.h win_res.h sizetip.h
-windlg.obj: windlg.c putty.h ssh.h win_res.h
-terminal.obj: terminal.c putty.h
-sizetip.obj: sizetip.c putty.h
-telnet.obj: telnet.c putty.h
-raw.obj: raw.c putty.h
-xlat.obj: xlat.c putty.h
-misc.obj: misc.c putty.h
-noise.obj: noise.c putty.h ssh.h
-ssh.obj: ssh.c ssh.h putty.h
-sshcrc.obj: sshcrc.c ssh.h
-sshdes.obj: sshdes.c ssh.h
-sshmd5.obj: sshmd5.c ssh.h
-sshrsa.obj: sshrsa.c ssh.h
-sshsha.obj: sshsha.c ssh.h
-sshrand.obj: sshrand.c ssh.h
-sshblowf.obj: sshblowf.c ssh.h
-version.obj: versionpseudotarget
-	@echo (built version.obj)
+LIBS2 = comctl32.lib comdlg32.lib
+LIBS3 = shell32.lib
+SOCK1 = wsock32.lib
+SOCK2 = ws2_32.lib
+
+all: putty.exe puttytel.exe pscp.exe plink.exe pageant.exe
+
+putty.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(POBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(PRESRC) putty.rsp
+	link $(LFLAGS) -out:putty.exe @putty.rsp
+
+puttytel.exe: $(GOBJS1) $(GOBJS2) $(LOBJS1) $(TOBJS) $(MOBJS) $(TRESRC) puttytel.rsp
+	link $(LFLAGS) -out:puttytel.exe @puttytel.rsp
+
+pageant.exe: $(PAGE1) $(PAGE2) $(PAGERC) pageant.rsp
+	link $(LFLAGS) -out:pageant.exe @pageant.rsp
+
+pscp.exe: $(SOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(SRESRC) pscp.rsp
+	link $(LFLAGS) -out:pscp.exe @pscp.rsp
+
+plink.exe: $(LOBJS1) $(POBJS) $(PLOBJS) $(MOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(LRESRC) plink.rsp
+	link $(LFLAGS) -out:plink.exe @plink.rsp
+
+putty.rsp: makefile
+	echo /nologo /subsystem:windows > putty.rsp
+	echo $(GOBJS1) >> putty.rsp
+	echo $(GOBJS2) >> putty.rsp
+	echo $(LOBJS1) >> putty.rsp
+	echo $(POBJS) >> putty.rsp
+	echo $(MOBJS) >> putty.rsp
+	echo $(OBJS1) >> putty.rsp
+	echo $(OBJS2) >> putty.rsp
+	echo $(OBJS3) >> putty.rsp
+	echo $(PRESRC) >> putty.rsp
+	echo $(LIBS1) >> putty.rsp
+	echo $(LIBS2) >> putty.rsp
+	echo $(SOCK1) >> putty.rsp
+
+puttytel.rsp: makefile
+	echo /nologo /subsystem:windows > puttytel.rsp
+	echo $(GOBJS1) >> puttytel.rsp
+	echo $(GOBJS2) >> puttytel.rsp
+	echo $(LOBJS1) >> puttytel.rsp
+	echo $(TOBJS) >> puttytel.rsp
+	echo $(MOBJS) >> puttytel.rsp
+	echo $(TRESRC) >> puttytel.rsp
+	echo $(LIBS1) >> puttytel.rsp
+	echo $(LIBS2) >> puttytel.rsp
+	echo $(SOCK1) >> puttytel.rsp
+
+pageant.rsp: makefile
+	echo /nologo /subsystem:windows > 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
+
+pscp.rsp: makefile
+	echo /nologo /subsystem:console > pscp.rsp
+	echo $(SOBJS) >> pscp.rsp
+	echo $(MOBJS) >> pscp.rsp
+	echo $(OBJS1) >> pscp.rsp
+	echo $(OBJS2) >> pscp.rsp
+	echo $(OBJS3) >> pscp.rsp
+	echo $(SRESRC) >> pscp.rsp
+	echo $(LIBS1) >> pscp.rsp
+	echo $(LIBS2) >> pscp.rsp
+	echo $(SOCK1) >> pscp.rsp
+
+plink.rsp: makefile
+	echo /nologo /subsystem:console > plink.rsp
+	echo $(LOBJS1) >> plink.rsp
+	echo $(POBJS) >> plink.rsp
+	echo $(PLOBJS) >> plink.rsp
+	echo $(MOBJS) >> plink.rsp
+	echo $(OBJS1) >> plink.rsp
+	echo $(OBJS2) >> plink.rsp
+	echo $(OBJS3) >> plink.rsp
+	echo $(LRESRC) >> plink.rsp
+	echo $(LIBS1) >> plink.rsp
+ 	echo $(LIBS2) >> plink.rsp
+ 	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 storage.h
+winstore.$(OBJ): winstore.c putty.h storage.h
+terminal.$(OBJ): terminal.c putty.h
+sizetip.$(OBJ): sizetip.c putty.h
+telnet.$(OBJ): telnet.c putty.h
+raw.$(OBJ): raw.c putty.h
+xlat.$(OBJ): xlat.c putty.h
+ldisc.$(OBJ): ldisc.c putty.h
+misc.$(OBJ): misc.c putty.h
+noise.$(OBJ): noise.c putty.h ssh.h storage.h
+ssh.$(OBJ): ssh.c ssh.h putty.h tree234.h
+sshcrc.$(OBJ): sshcrc.c ssh.h
+sshdes.$(OBJ): sshdes.c ssh.h
+sshmd5.$(OBJ): sshmd5.c ssh.h
+sshrsa.$(OBJ): sshrsa.c ssh.h
+sshsha.$(OBJ): sshsha.c ssh.h
+sshrand.$(OBJ): sshrand.c ssh.h
+sshblowf.$(OBJ): sshblowf.c ssh.h
+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
+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
+pageant.$(OBJ): pageant.c ssh.h tree234.h
+tree234.$(OBJ): tree234.c tree234.h
+##--
 
 # Hack to force version.obj to be rebuilt always
+version.obj: versionpseudotarget
+	@echo (built version.obj)
 versionpseudotarget:
 	cl $(FWHACK) $(VER) $(CFLAGS) /c version.c
 
-win_res.res: win_res.rc win_res.h putty.ico
-	rc $(FWHACK) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
-
-pscp.exe: $(SCPOBJS) $(SCPOBJS2) $(SCPOBJS3) scp.res scp.rsp
-	link /debug -out:pscp.exe @scp.rsp
+##-- dependencies
+win_res.$(RES): win_res.rc win_res.h putty.ico
+##--
+win_res.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 win_res.rc
 
-scp.rsp: makefile
-	echo /nologo /subsystem:console > scp.rsp
-	echo $(SCPOBJS) >> scp.rsp
-	echo $(SCPOBJS2) >> scp.rsp
-	echo $(SCPOBJS3) >> scp.rsp
-	echo scp.res >> scp.rsp
-	echo $(LIBS1) >> scp.rsp
-	echo $(LIBS2) >> scp.rsp
+##-- dependencies
+nosshres.$(RES): nosshres.rc win_res.rc win_res.h putty.ico
+##--
+nosshres.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 nosshres.rc
 
-scp.obj: scp.c putty.h scp.h
-scpssh.obj: scpssh.c putty.h ssh.h scp.h
+##-- dependencies
+scp.$(RES): scp.rc scp.ico
+##--
+scp.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
 
-scp.res: scp.rc scp.ico
-	rc -r -DWIN32 -D_WIN32 -DWINVER=0x0400 scp.rc
+##-- dependencies
+pageant.$(RES): pageant.rc pageant.ico pageants.ico
+##--
+pageant.$(RES):
+	rc $(FWHACK) $(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 pageant.rc
 
 clean:
 	del *.obj
@@ -96,3 +254,8 @@ clean:
 	del *.ilk
 	del *.pdb
 	del *.rsp
+	del *.dsp
+	del *.dsw
+	del *.ncb
+	del *.opt
+	del *.plg