X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/65e2b30c97746dc87e6d7bf8f6cfffa42bf35e4f..HEAD:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index b52bf91d..a8574bfc 100755
--- 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 = ("./");
 
@@ -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";