X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=3b2db901b650fe84fa2043cdfacbbb9cd4fa698e;hb=29d805a49eab70cd6144a343605874985db072c2;hp=fc8e444a55a16ea84ee79c1031bfdf6db5f46095;hpb=d8fdb494515c17b4a529f99a81d20214687bf6a3;p=PuTTY.git diff --git a/Recipe b/Recipe index fc8e444a..3b2db901 100644 --- a/Recipe +++ b/Recipe @@ -14,13 +14,12 @@ # Locations and types of output Makefiles. !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 !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 @@ -28,7 +27,6 @@ !srcdir charset/ !srcdir windows/ !srcdir unix/ -!srcdir macosx/ # Help text added to the top of each Makefile, with /D converted # into -D as appropriate for the particular Makefile. @@ -47,14 +45,17 @@ # 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 restriction of the process ACLs (on all versions +# of Windows, without warning), as if UNPROTECT below were set. # # - COMPAT=/DNO_MULTIMON (Windows only) # Disables PuTTY's use of , which is not available @@ -62,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 @@ -103,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 @@ -140,6 +134,20 @@ # ------------------------------------------------------------ # 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 @@ -173,9 +181,6 @@ install: install-strip: $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" !end -!begin osx vars -CFLAGS += -DMACOSX -!end # List the man pages for the automake makefile. !begin am @@ -192,6 +197,18 @@ install-exec-local: endif !end +# In automake makefile, build the OS X app bundle, if configured in +# Quartz mode. +!begin am +if HAVE_QUARTZ +noinst_SCRIPTS = unix/PuTTY.app unix/Pterm.app +unix/PuTTY.app: unix/putty.bundle puttyapp osxlaunch + rm -rf $@ && gtk-mac-bundler $< +unix/Pterm.app: unix/pterm.bundle ptermapp osxlaunch + rm -rf $@ && gtk-mac-bundler $< +endif +!end + # Random symbols. !begin cygwin vars # _WIN32_IE is required to expose identifiers that only make sense on @@ -218,7 +235,7 @@ GUITERM = TERMINAL window windlg winctrls sizetip winucs winprint # Same thing on Unix. UXTERM = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols gtkmisc xkeysym -OSXTERM = UXTERM osxwin osxdlg osxctrls + + x11misc gtkcomm # Non-SSH back ends (putty, puttytel, plink). NONSSH = telnet raw rlogin ldisc pinger @@ -241,7 +258,6 @@ MISC = timing callback misc version settings tree234 proxy conf be_misc WINMISC = MISC winstore winnet winhandl cmdline windefs winmisc winproxy + wintime winhsock errsock winsecur 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. @@ -290,25 +306,27 @@ 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 sshecc - + sshecdsag + + sshecdsag winsecur pterm : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg - + nogss + + nogss gtkmain putty : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty - + xpmpucfg + + xpmpucfg gtkmain puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg - + nogss + + nogss gtkmain plink : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal + ux_x11 noterm -puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version +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 +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 @@ -318,8 +336,24 @@ pageant : [X] uxpgnt uxagentc pageant sshrsa sshpubk sshdes sshbn sshmd5 + 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 +ptermapp : [XT] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg + + nogss gtkapp +puttyapp : [XT] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore + + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty + + xpmpucfg gtkapp +osxlaunch : [UT] osxlaunch -fuzzterm : [UT] UXTERM CHARSET misc uxmisc uxucs fuzzterm time settings +fuzzterm : [UT] UXTERM CHARSET misc version uxmisc uxucs fuzzterm time settings + uxstore be_none +testbn : [UT] testbn sshbn misc version conf tree234 uxmisc +testbn : [C] testbn sshbn misc version conf tree234 winmisc LIBS + +# ---------------------------------------------------------------------- +# On Windows, provide a means of removing local test binaries that we +# aren't going to actually ship. (I prefer this to not building them +# in the first place, so that we find out about build breakage early.) +!begin vc +cleantestprogs: + -del $(BUILDDIR)testbn.exe +!end