Rename Makefile.cyg to Makefile.mgw.

It's really only useful with MinGW rather than a Cygwin toolchain these
days, as recent versions of the latter insist against linking with the
Cygwin DLL.

(I think it may no longer be possible to build with Cygwin out of the
box at all these days, but I'm not going to say so without having
actually checked that's the case. Settle for listing MinGW first in
various comments and docs.)

diff --git a/.gitignore b/.gitignore
index e9ffff305fbcf46887744dfc9767464e759eee23..7da513927d41edf6ff4b43eaa796d585fb311e3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 /*.td2
 /*.map
 /Makefile.bor
-/Makefile.cyg
+/Makefile.mgw
 /Makefile.vc
 /Makefile.lcc
 /MSVC
@@ -128,7 +128,7 @@
 /windows/*.td2
 /windows/*.map
 /windows/Makefile.bor
-/windows/Makefile.cyg
+/windows/Makefile.mgw
 /windows/Makefile.vc
 /windows/Makefile.lcc
 /windows/MSVC

diff --git a/Buildscr.cv b/Buildscr.cv
index d2df1535dc827cc953bb78b61fc1bb832b9a4933..a888e2481f0933033cf12b33566a42281fb69823 100644 (file)
--- a/Buildscr.cv
+++ b/Buildscr.cv
@@ -25,7 +25,7 @@ enddelegate
 # Windows scanner for download).
 delegate covscan32wine
   in putty do tar xzvf cov-int.tar.gz
-  in putty/windows do cov-build --dir ../cov-int make -f Makefile.cyg CC=winegcc RC=wrc XFLAGS=-DCOVERITY
+  in putty/windows do cov-build --dir ../cov-int make -f Makefile.mgw CC=winegcc RC=wrc XFLAGS=-DCOVERITY
   in putty do tar czvf cov-int.tar.gz cov-int
   return putty/cov-int.tar.gz
 enddelegate

diff --git a/README b/README
index 10bd626156df6a2bfbd58db339d463d893a4b66d..facdb7449e1e543e7cc5b8ab9c1ea70c890865df 100644 (file)
--- a/README
+++ b/README
@@ -34,8 +34,8 @@ For building on Windows:
    Makefile.bor' while in the `windows' subdirectory to build all
    the PuTTY binaries.
 
- - windows/Makefile.cyg is for Cygwin / MinGW installations. Type
-   `make -f Makefile.cyg' while in the `windows' subdirectory to
+ - windows/Makefile.mgw is for MinGW / Cygwin installations. Type
+   `make -f Makefile.mgw' while in the `windows' subdirectory to
    build all the PuTTY binaries.
 
    You'll probably need quite a recent version of the w32api package.
@@ -50,7 +50,7 @@ For building on Windows:
  - Inside the windows/DEVCPP subdirectory are Dev-C++ project
    files for doing GUI-based builds of the various PuTTY utilities.
 
-The PuTTY team actively use Makefile.vc (with VC7) and Makefile.cyg
+The PuTTY team actively use Makefile.vc (with VC7) and Makefile.mgw
 (with mingw32), so we'll probably notice problems with those
 toolchains fairly quickly. Please report any problems with the other
 toolchains mentioned above.
@@ -99,7 +99,7 @@ For building on Unix:
 
  - It's also possible to build the Windows version of PuTTY to run
    on Unix by using Winelib.  To do this, change to the `windows'
-   directory and run `make -f Makefile.cyg CC=winegcc RC=wrc'.
+   directory and run `make -f Makefile.mgw CC=winegcc RC=wrc'.
 
 All of the Makefiles are generated automatically from the file
 `Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,

diff --git a/Recipe b/Recipe
index 39ab078ae254dc63da0cb4819dae6f25d2213311..f6de905e4c40cfdb929b012a62cf105a65db6803 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -14,7 +14,7 @@
 # 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
@@ -46,8 +46,8 @@
 #
 #  - COMPAT=/DNO_SECURITY (Windows only)
 #      Disables Pageant's use of <aclapi.h>, which is not available
-#      with some development environments (such as older versions of
-#      the Cygwin/mingw GNU toolchain). This means that Pageant
+#      with some development environments (such as very old versions
+#      of the mingw/Cygwin 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

diff --git a/mkfiles.pl b/mkfiles.pl
index 1e9303270d4c910c26b87510f00c9f51fbcaac84..749cc23685f2866147db7d77fc26bfb1aacf5679 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -441,10 +441,10 @@ $orig_dir = cwd;
 if (defined $makefiles{'cygwin'}) {
     $dirpfx = &dirpfx($makefiles{'cygwin'}, "/");
 
-    ##-- CygWin makefile
+    ##-- MinGW/CygWin makefile (called 'cygwin' for historical reasons)
     open OUT, ">$makefiles{'cygwin'}"; select OUT;
     print
-    "# Makefile for $project_name under Cygwin, MinGW, or Winelib.\n".
+    "# Makefile for $project_name under MinGW, Cygwin, or Winelib.\n".
     "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
     "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
     # gcc command line option is -D not /D

diff --git a/windows/winshare.c b/windows/winshare.c
index 3954045cf612500bcda284e13f8fd43a214d28ea..56276045b7ed29a6cbec4a075ba3d7332ab90ec2 100644 (file)
--- a/windows/winshare.c
+++ b/windows/winshare.c
@@ -20,7 +20,7 @@
 #ifdef COVERITY
 /*
  * The hack I use to build for Coverity scanning, using winegcc and
- * Makefile.cyg, didn't provide some defines in wincrypt.h last time I
+ * Makefile.mgw, didn't provide some defines in wincrypt.h last time I
  * looked. Therefore, define them myself here, but enclosed in #ifdef
  * COVERITY to ensure I don't make up random nonsense values for any
  * real build.