X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=a2698baaf15c36d2a94b7f46908d1c982b48333d;hb=9ce982622f9ab07b85cbb06d06f53b71fb9558a9;hp=39ab078ae254dc63da0cb4819dae6f25d2213311;hpb=b0b5d5fbe63e982d6a230269a2e2a823e2586512;p=PuTTY.git diff --git a/Recipe b/Recipe index 39ab078a..a2698baa 100644 --- a/Recipe +++ b/Recipe @@ -12,9 +12,10 @@ # Overall project name. !name putty # Locations and types of output Makefiles. +!makefile clangcl windows/Makefile.clangcl !makefile vc windows/Makefile.vc !makefile vcproj windows/MSVC -!makefile cygwin windows/Makefile.cyg +!makefile cygwin windows/Makefile.mgw !makefile borland windows/Makefile.bor !makefile lcc windows/Makefile.lcc !makefile gtk unix/Makefile.gtk @@ -45,14 +46,16 @@ # does this. # # - COMPAT=/DNO_SECURITY (Windows only) -# Disables Pageant's use of , which is not available -# with some development environments (such as older versions of -# the Cygwin/mingw GNU toolchain). This means that Pageant -# won't care about the local user ID of processes accessing it; a -# version of Pageant built with this option will therefore refuse -# to run under NT-series OSes on security grounds (although it -# will run fine on Win95-series OSes where there is no access -# control anyway). +# Disables use of , which is not available with some +# development environments (such as very old versions of the +# mingw/Cygwin GNU toolchain). This has the following effects: +# - Pageant won't care about the local user ID of processes +# accessing it; a version of Pageant built with this option +# will therefore refuse to run under NT-series OSes on +# security grounds (although it will run fine on Win95-series +# OSes where there is no access control anyway). +# - SSH connection sharing is disabled. +# - There is no support for restriction of the process ACLs. # # - COMPAT=/DNO_MULTIMON (Windows only) # Disables PuTTY's use of , which is not available @@ -60,20 +63,14 @@ # full-screen mode (configurable to work on Alt-Enter) will # not behave usefully in a multi-monitor environment. # -# Note that this definition is always enabled in the Cygwin -# build, since at the time of writing this is -# known not to be available in Cygwin. -# # - COMPAT=/DNO_HTMLHELP (Windows only) # Disables PuTTY's use of , which is not available # with some development environments. The resulting binary # will only look for an old-style WinHelp file (.HLP/.CNT), and # will ignore any .CHM file. # -# Note that this definition is always enabled in the Cygwin -# build, since at the time of writing this is -# known not to be available in Cygwin (although you can use -# the htmlhelp.h supplied with HTML Help Workshop). +# If you don't have this header, you may be able to use the copy +# supplied with HTML Help Workshop. # # - RCFL=/DNO_MANIFESTS (Windows only) # Disables inclusion of XML application manifests in the PuTTY @@ -101,8 +98,7 @@ # # - 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. +# from some environments' header files. # # - XFLAGS=/DTELNET_DEFAULT # Causes PuTTY to default to the Telnet protocol (in the absence @@ -112,10 +108,6 @@ # - XFLAGS=/DDEBUG # Causes PuTTY to enable internal debugging. # -# - XFLAGS=/DUNPROTECT -# Disable tightened ACL on PuTTY process so that e.g. debuggers -# can attach to it. -# # - XFLAGS=/DMALLOC_LOG # Causes PuTTY to emit a file called putty_mem.log, logging every # memory allocation and free, so you can track memory leaks. @@ -138,10 +130,28 @@ # ------------------------------------------------------------ # Additional text added verbatim to each individual Makefile. +!cflags am version +!begin am +if AUTO_GIT_COMMIT +BUILT_SOURCES = empty.h +CLEANFILES = empty.h +libversion_a_CFLAGS += -DSOURCE_COMMIT=\"`git --git-dir=$(srcdir)/.git rev-parse HEAD 2>/dev/null`\" +empty.h: $(allsources) + echo '/* Empty file touched by automake makefile to force rebuild of version.o */' >$@ +endif +!end +!begin >empty.h +/* Empty file touched by automake makefile to force rebuild of version.o */ +!end + !begin vc vars CFLAGS = $(CFLAGS) /DHAS_GSSAPI !end +!begin clangcl vars +CFLAGS += /DHAS_GSSAPI +!end + # `make install' target for Unix. !begin gtk install: @@ -174,8 +184,12 @@ install-strip: # 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 +if HAVE_GTK +man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/puttygen.1 \ + doc/pageant.1 doc/pterm.1 doc/putty.1 doc/puttytel.1 +else +man1_MANS = doc/plink.1 doc/pscp.1 doc/psftp.1 doc/puttygen.1 +endif !end # In automake, chgrp/chmod pterm after installation, if configured to. @@ -234,7 +248,7 @@ NONSSH = telnet raw rlogin ldisc pinger SSH = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd + sshaes sshccp sshsh256 sshsh512 sshbn wildcard pinger ssharcf - + sshgssc pgssapi sshshare sshecc + + sshgssc pgssapi sshshare sshecc aqsync WINSSH = SSH winnoise wincapi winpgntc wingss winshare winnps winnpc + winhsock errsock UXSSH = SSH uxnoise uxagentc uxgss uxshare @@ -289,7 +303,7 @@ psftp : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC + psftp.res winnojmp LIBS pageant : [G] winpgnt pageant sshrsa sshpubk sshdes sshbn sshmd5 version - + tree234 misc sshaes sshsha winsecur winpgntc sshdss sshsh256 + + tree234 misc sshaes sshsha winsecur winpgntc aqsync sshdss sshsh256 + sshsh512 winutils sshecc winmisc winhelp conf pageant.res LIBS puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version @@ -309,22 +323,22 @@ puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH + nogss gtkmain plink : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal - + ux_x11 noterm + + ux_x11 noterm uxnogtk PUTTYGEN_UNIX = 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 sshecc sshecdsag + + uxgen notiming conf sshecc sshecdsag uxnogtk puttygen : [U] cmdgen PUTTYGEN_UNIX cgtest : [UT] cgtest PUTTYGEN_UNIX -pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC -psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC +pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC uxnogtk +psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC uxnogtk -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 +pageant : [X] uxpgnt uxagentc aqsync 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 ptermapp : [XT] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg @@ -334,10 +348,10 @@ puttyapp : [XT] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + xpmpucfg gtkapp osxlaunch : [UT] osxlaunch -fuzzterm : [UT] UXTERM CHARSET misc uxmisc uxucs fuzzterm time settings - + uxstore be_none -testbn : [UT] testbn sshbn misc conf tree234 uxmisc -testbn : [C] testbn sshbn misc conf tree234 winmisc LIBS +fuzzterm : [UT] UXTERM CHARSET misc version uxmisc uxucs fuzzterm time settings + + uxstore be_none uxnogtk +testbn : [UT] testbn sshbn misc version conf tree234 uxmisc uxnogtk +testbn : [C] testbn sshbn misc version conf tree234 winmisc LIBS # ---------------------------------------------------------------------- # On Windows, provide a means of removing local test binaries that we @@ -347,3 +361,7 @@ testbn : [C] testbn sshbn misc conf tree234 winmisc LIBS cleantestprogs: -del $(BUILDDIR)testbn.exe !end +!begin clangcl +cleantestprogs: + -rm -f $(BUILDDIR)testbn.exe +!end