Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 3786d31..a8574bf 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -46,7 +46,7 @@ open IN, "Recipe" or do {
 # HACK: One of the source files in `charset' is auto-generated by
 # sbcsgen.pl. We need to generate that _now_, before attempting
 # dependency analysis.
-eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."';
+eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."; select STDOUT;';
 
 @srcdirs = ("./");
 
@@ -433,7 +433,7 @@ if (defined $makefiles{'cygwin'}) {
     ##-- CygWin makefile
     open OUT, ">$makefiles{'cygwin'}"; select OUT;
     print
-    "# Makefile for $project_name under cygwin.\n".
+    "# Makefile for $project_name under Cygwin, MinGW, 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
@@ -492,7 +492,7 @@ if (defined $makefiles{'cygwin'}) {
     print "\n";
     print $makefile_extra{'cygwin'}->{'end'};
     print "\nclean:\n".
-    "\trm -f *.o *.exe *.res.o *.map\n".
+    "\trm -f *.o *.exe *.res.o *.so *.map\n".
     "\n".
     "FORCE:\n";
     select STDOUT; close OUT;
@@ -1155,7 +1155,10 @@ if (defined $makefiles{'am'}) {
       $objtosrc{$d->{obj}} = $d->{deps}->[0];
     }
 
-    @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)", map {"-I$dirpfx$_"} @srcdirs);
+    print &splitline(join " ", "AM_CPPFLAGS", "=",
+                     map {"-I$dirpfx$_"} @srcdirs), "\n";
+
+    @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)");
     print "if HAVE_GTK\n";
     print &splitline(join " ", "AM_CFLAGS", "=",
                      "\$(GTK_CFLAGS)", @amcflags), "\n";