X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=89609df68c4d3313c6c431c1df190b71edc0327d;hb=9dd9860cc84f82309de64c33e2813c6e9dc60749;hp=03b6970bbf0efb8c0c3a37a6b4246a89fe197f3a;hpb=a947c49bec36957cb5d38e1dc2e22dc0e3465849;p=PuTTY.git

diff --git a/Recipe b/Recipe
index 03b6970b..89609df6 100644
--- a/Recipe
+++ b/Recipe
@@ -37,14 +37,6 @@
 #
 # Extra options you can set:
 #
-#  - VER="/DSNAPSHOT=1999-01-25 /DSVN_REV=1234"
-#      Generates executables whose About box report them as being a
-#      development snapshot. SVN_REV is a Subversion revision number.
-#
-#  - VER=/DRELEASE=0.43
-#      Generates executables whose About box report them as being a
-#      release version.
-#
 #  - COMPAT=/DAUTO_WINSOCK (Windows only)
 #      Causes PuTTY to assume that <windows.h> includes its own WinSock
 #      header file, so that it won't try to include <winsock.h>.
@@ -138,79 +130,9 @@
 # ------------------------------------------------------------
 # Additional text added verbatim to each individual Makefile.
 
-# Hack to force version.o to be rebuilt always.
-!begin vc
-version.obj: *.c *.h *.rc
-	cl $(VER) $(CFLAGS) /c ..\version.c
-!end
-!specialobj vc version
-!begin cygwin
-version.o: FORCE
-	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
-!end
-!specialobj cygwin version
-!begin borland
-version.obj: FORCE
-	bcc32 $(VER) $(CFLAGS) /c ..\version.c
-!end
-!specialobj borland version
-!begin lcc
-version.obj: FORCE
-	lcc $(VER) $(CFLAGS) /c ..\version.c
-!end
-!specialobj lcc version
-# For Unix, we also need the gross MD5 hack that causes automatic
-# version number selection in release source archives.
-!begin gtk
-version.o: FORCE
-	if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
-	else \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
-	fi
-!end
-!specialobj gtk version
-# In the automake build, we have to do the whole job by supplying
-# extra CFLAGS, so we have to put the if statement inside one big
-# backtick expression. We also force rebuilding via a -D option that
-# makes version.o include empty.h, which we construct ourselves and
-# touch whenever any source file is updated.
-!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir)/..; md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/../version.def; else echo "$(VER)"; fi`
-!begin am
-BUILT_SOURCES = empty.h
-empty.h: $(allsources)
-	echo '/* Empty file touched by automake makefile to force rebuild of version.o */' >$@
-
-!end
-!begin >empty.h
-/* Empty file touched by automake makefile to force rebuild of version.o */
-!end
-
-# Add VER to Windows resource targets, and force them to be rebuilt every
-# time, on the assumption that they will contain version information.
 !begin vc vars
-CFLAGS = $(CFLAGS) /DHAS_GSSAPI /DSECURITY_WIN32
-RCFLAGS = $(RCFLAGS) $(VER)
-!end
-!begin cygwin vars
-CFLAGS += -DSECURITY_WIN32
-# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile.
-RCFLAGS += $(patsubst -D%,--define %,$(VER))
-!end
-!begin borland vars
-# Borland doesn't support +=. This probably shouldn't work, but seems to.
-RCFLAGS = $(RCFLAGS) $(VER)
-!end
-!begin lcc vars
-RCFLAGS += $(VER)
+CFLAGS = $(CFLAGS) /DHAS_GSSAPI
 !end
-!forceobj putty.res
-!forceobj puttytel.res
-!forceobj plink.res
-!forceobj pscp.res
-!forceobj psftp.res
-!forceobj pageant.res
-!forceobj puttygen.res
 
 # `make install' target for Unix.
 !begin gtk
@@ -281,11 +203,11 @@ TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi
 
 # GUI front end and terminal emulator (putty, puttytel).
 GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
-         + winutils wincfg sercfg winhelp winjump
+         + winutils wincfg sercfg winhelp winjump miscucs
 
 # Same thing on Unix.
-UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback
-GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym
+UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs
+GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols gtkmisc xkeysym
 OSXTERM  = UXTERM osxwin osxdlg osxctrls
 
 # Non-SSH back ends (putty, puttytel, plink).
@@ -294,8 +216,8 @@ NONSSH   = telnet raw rlogin ldisc pinger
 # SSH back end (putty, plink, pscp, psftp).
 SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
-         + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf
-         + sshgssc pgssapi sshshare
+         + sshaes sshccp sshsh256 sshsh512 sshbn wildcard pinger ssharcf
+         + sshgssc pgssapi sshshare sshecc
 WINSSH   = SSH winnoise winsecur winpgntc wingss winshare winnps winnpc
          + winhsock errsock
 UXSSH    = SSH uxnoise uxagentc uxgss uxshare
@@ -308,8 +230,12 @@ SFTP     = sftp int64 logging
 MISC     = timing callback misc version settings tree234 proxy conf
 WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
          + wintime winhsock errsock
-UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
-OSXMISC  = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time
+UXMISC   = MISC uxstore uxsel uxnet uxpeer cmdline uxmisc uxproxy time
+OSXMISC  = MISC uxstore uxsel osxsel uxnet uxpeer uxmisc uxproxy time
+
+# import.c and dependencies, for PuTTYgen-like utilities that have to
+# load foreign key files.
+IMPORT   = import sshbcrypt sshblowf
 
 # Character set library, for use in pterm.
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
@@ -346,14 +272,15 @@ pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
 psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
          + psftp.res winnojmp LIBS
 
-pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
-         + misc sshaes sshsha winsecur winpgntc sshdss sshsh256 sshsh512
-	 + winutils winmisc winhelp conf pageant.res LIBS
+pageant  : [G] winpgnt pageant sshrsa sshpubk sshdes sshbn sshmd5 version
+	 + tree234 misc sshaes sshsha winsecur winpgntc sshdss sshsh256
+	 + sshsh512 winutils sshecc winmisc winhelp conf pageant.res LIBS
 
 puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
-         + sshpubk sshaes sshsh256 sshsh512 import winutils puttygen.res
-	 + tree234 notiming winhelp winnojmp conf LIBS wintime
+         + sshpubk sshaes sshsh256 sshsh512 IMPORT winutils puttygen.res
+         + tree234 notiming winhelp winnojmp conf LIBS wintime sshecc
+         + sshecdsag
 
 pterm    : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
          + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
@@ -370,11 +297,16 @@ plink    : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal
 
 puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
-         + sshpubk sshaes sshsh256 sshsh512 import puttygen.res time tree234
-	 + uxgen notiming conf
+         + sshpubk sshaes sshsh256 sshsh512 IMPORT puttygen.res time tree234
+         + uxgen notiming conf sshecc sshecdsag
 
 pscp     : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 
+pageant  : [X] uxpgnt uxagentc pageant sshrsa sshpubk sshdes sshbn sshmd5
+	 + version tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 sshecc
+	 + conf uxsignal nocproxy nogss be_none x11fwd ux_x11 uxcons gtkask
+	 + gtkmisc UXMISC
+
 PuTTY    : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH
          + ux_x11 uxpty uxsignal testback putty.icns info.plist