X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=bac258f18b8fc5bf5f2164d1255ecfa3482e6a63;hb=26d3ccdfc5500a8afdbd54938677ef4ef985caaa;hp=8854c402e1cd5097c3493f5c4762527656c8daaa;hpb=93c6e2c987dbe141f94521947f6037537e7832b9;p=PuTTY.git diff --git a/Recipe b/Recipe index 8854c402..bac258f1 100644 --- a/Recipe +++ b/Recipe @@ -18,15 +18,16 @@ !makefile borland windows/Makefile.bor !makefile lcc windows/Makefile.lcc !makefile gtk unix/Makefile.gtk -!makefile ac unix/Makefile.in -!makefile mpw mac/Makefile.mpw +!makefile unix unix/Makefile.ux +!makefile am Makefile.am !makefile osx macosx/Makefile !makefile devcppproj windows/DEVCPP +!makefile vstudio10 windows/VS2010 +!makefile vstudio12 windows/VS2012 # Source directories. !srcdir charset/ !srcdir windows/ !srcdir unix/ -!srcdir mac/ !srcdir macosx/ # Help text added to the top of each Makefile, with /D converted @@ -36,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 includes its own WinSock # header file, so that it won't try to include . @@ -95,16 +88,23 @@ # it to compile under development environments which do not # support IPv6 in their header files. # +# - COMPAT=/DNO_GSSAPI +# Disables PuTTY's ability to use GSSAPI functions for +# authentication and key exchange. +# +# - COMPAT=/DSTATIC_GSSAPI +# Causes PuTTY to try to link statically against the GSSAPI +# library instead of the default of doing it at run time. +# # - COMPAT=/DMSVC4 (Windows only) # - RCFL=/DMSVC4 # Makes a couple of minor changes so that PuTTY compiles using # MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON. # -# - RCFL=/DASCIICTLS (Windows only) -# 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. +# - COMPAT=/DNO_SECUREZEROMEMORY (Windows only) +# Disables PuTTY's use of SecureZeroMemory(), which is missing +# from some environments' header files. This is enabled by +# default in the Cygwin Makefile. # # - XFLAGS=/DTELNET_DEFAULT # Causes PuTTY to default to the Telnet protocol (in the absence @@ -130,62 +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 - -# 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 -RCFLAGS = $(RCFLAGS) $(VER) -!end -!begin cygwin vars -# 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 @@ -220,6 +167,21 @@ install-strip: CFLAGS += -DMACOSX !end +# List the man pages for the automake makefile. +!begin am +man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/pterm.1 \ + doc/putty.1 doc/puttygen.1 doc/puttytel.1 +!end + +# In automake, chgrp/chmod pterm after installation, if configured to. +!begin am +if HAVE_SETID_CMD +install-exec-local: + @SETID_CMD@ $(bindir)/pterm + chmod @SETID_MODE@ $(bindir)/pterm +endif +!end + # Random symbols. !begin cygwin vars # _WIN32_IE is required to expose identifiers that only make sense on @@ -237,14 +199,14 @@ CFLAGS += -DWINVER=0x0500 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0500 # Terminal emulator and its (platform-independent) dependencies. TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi - + config dialog + + config dialog conf # GUI front end and terminal emulator (putty, puttytel). GUITERM = TERMINAL window windlg winctrls sizetip winucs winprint - + winutils wincfg sercfg winhelp + + winutils wincfg sercfg winhelp winjump # Same thing on Unix. -UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing +UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing callback GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym OSXTERM = UXTERM osxwin osxdlg osxctrls @@ -255,34 +217,34 @@ NONSSH = telnet raw rlogin ldisc pinger SSH = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf -WINSSH = SSH winnoise winpgntc -UXSSH = SSH uxnoise uxagentc -MACSSH = SSH macnoise + + sshgssc pgssapi sshshare +WINSSH = SSH winnoise winsecur winpgntc wingss winshare winnps winnpc + + winhsock errsock +UXSSH = SSH uxnoise uxagentc uxgss uxshare # SFTP implementation (pscp, psftp). SFTP = sftp int64 logging # Miscellaneous objects appearing in all the network utilities (not # Pageant or PuTTYgen). -MISC = timing misc version settings tree234 proxy +MISC = timing callback misc version settings tree234 proxy conf WINMISC = MISC winstore winnet winhandl cmdline windefs winmisc winproxy - + wintime + + wintime winhsock errsock UXMISC = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time OSXMISC = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time -MACMISC = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy # Character set library, for use in pterm. CHARSET = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc # Standard libraries. LIBS = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib - + shell32.lib winmm.lib imm32.lib winspool.lib + + shell32.lib winmm.lib imm32.lib winspool.lib ole32.lib # Network backend sets. This also brings in the relevant attachment # to proxy.c depending on whether we're crypto-avoidant or not. BE_ALL = be_all cproxy BE_NOSSH = be_nossh nocproxy -BE_SSH = be_none cproxy +BE_SSH = be_ssh cproxy BE_NONE = be_none nocproxy # More backend sets, with the additional Windows serial-port module. W_BE_ALL = be_all_s winser cproxy @@ -295,54 +257,46 @@ U_BE_NOSSH = be_nos_s uxser nocproxy # Definitions of actual programs. The program name, followed by a # colon, followed by a list of objects. Also in the list may be the # keywords [G] for Windows GUI app, [C] for Console app, [X] for -# X/GTK Unix app, [U] for command-line Unix app, [M] for Macintosh app. +# X/GTK Unix app, [U] for command-line Unix app. -putty : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC putty.res LIBS -puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res LIBS +putty : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res LIBS +puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res nogss LIBS plink : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC - + plink.res LIBS + + winx11 plink.res winnojmp noterm LIBS pscp : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC - + pscp.res LIBS + + pscp.res winnojmp LIBS psftp : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC - + psftp.res LIBS + + psftp.res winnojmp LIBS pageant : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234 - + misc sshaes sshsha winpgntc sshdss sshsh256 sshsh512 winutils - + winmisc winhelp pageant.res LIBS + + misc sshaes sshsha winsecur winpgntc sshdss sshsh256 sshsh512 + + winutils 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 LIBS wintime + + tree234 notiming winhelp winnojmp conf LIBS wintime pterm : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg + + nogss putty : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty + xpmpucfg puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg + + nogss plink : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal - + ux_x11 + + ux_x11 noterm 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 + + uxgen notiming conf pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC -PuTTY : [M] terminal wcwidth ldiscucs logging BE_ALL mac macdlg macevlog - + macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET - + stricmp vsnprint dialog config macctrls minibidi -PuTTYtel : [M] terminal wcwidth ldiscucs logging BE_NOSSH mac macdlg - + macevlog macterm macucs mac_res.rsrc testback NONSSH MACMISC - + CHARSET stricmp vsnprint dialog config macctrls minibidi -PuTTYgen : [M] macpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version - + sshrand macnoise sshsha macstore misc sshrsa sshdss macmisc sshpubk - + sshaes sshsh256 sshsh512 import macpgen.rsrc macpgkey macabout - PuTTY : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH + ux_x11 uxpty uxsignal testback putty.icns info.plist