Fix a few more clang-generated warnings.

[PuTTY.git] / Recipe

diff --git a/Recipe b/Recipe
index 952373f20e25bab0c92335cd431bd5b62d5fef0c..9d011f5acaa1bc0ee74ee8f5cb193b49b61ca45d 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -12,6 +12,7 @@
 # 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.mgw
@@ -54,8 +55,7 @@
 #         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.
+#       - There is no support for restriction of the process ACLs.
 #
 #  - COMPAT=/DNO_MULTIMON (Windows only)
 #      Disables PuTTY's use of <multimon.h>, which is not available
@@ -108,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.
@@ -134,13 +130,15 @@
 # ------------------------------------------------------------
 # Additional text added verbatim to each individual Makefile.
 
-!cflags am version -DSOURCE_COMMIT=\"`git rev-parse HEAD 2>/dev/null`\"
+!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 */
@@ -150,6 +148,10 @@ empty.h: $(allsources)
 CFLAGS = $(CFLAGS) /DHAS_GSSAPI
 !end
 
+!begin clangcl vars
+CFLAGS += /DHAS_GSSAPI
+!end
+
 # `make install' target for Unix.
 !begin gtk
 install:
@@ -242,7 +244,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
@@ -297,7 +299,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
@@ -329,10 +331,10 @@ 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
 
-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
@@ -355,3 +357,7 @@ testbn   : [C] testbn sshbn misc version conf tree234 winmisc LIBS
 cleantestprogs:
        -del $(BUILDDIR)testbn.exe
 !end
+!begin clangcl
+cleantestprogs:
+       -rm -f $(BUILDDIR)testbn.exe
+!end