X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/bc7af29915772aa0043ab208c258d6f8740e93b4..5462f4596108c4309fb69b4e57aa1e59d7100908:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 29c248e8..fd543eb0 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -20,16 +20,19 @@ use FileHandle;
 use File::Basename;
 use Cwd;
 
-if ($#ARGV >= 0 and $ARGV[0] eq "-u") {
+if ($#ARGV >= 0 and ($ARGV[0] eq "-u" or $ARGV[0] eq "-U")) {
     # Convenience for Unix users: -u means that after we finish what
     # we're doing here, we also run mkauto.sh and then 'configure' in
     # the Unix subdirectory. So it's a one-stop shop for regenerating
     # the actual end-product Unix makefile.
     #
     # Arguments supplied after -u go to configure.
+    #
+    # -U is identical, but runs 'configure' at the _top_ level, for
+    # people who habitually do that.
+    $do_unix = ($ARGV[0] eq "-U" ? 2 : 1);
     shift @ARGV;
     @confargs = @ARGV;
-    $do_unix = 1;
 }
 
 open IN, "Recipe" or do {
@@ -85,7 +88,9 @@ while (<IN>) {
   }
   if ($_[0] eq "!forceobj") { $forceobj{$_[1]} = 1; next; }
   if ($_[0] eq "!begin") {
-      if (&mfval($_[1])) {
+      if ($_[1] =~ /^>(.*)/) {
+	  $divert = \$auxfiles{$1};
+      } elsif (&mfval($_[1])) {
           $sect = $_[2] ? $_[2] : "end";
 	  $divert = \($makefile_extra{$_[1]}->{$sect});
       } else {
@@ -142,6 +147,12 @@ while (<IN>) {
 
 close IN;
 
+foreach $aux (sort keys %auxfiles) {
+    open AUX, ">$aux";
+    print AUX $auxfiles{$aux};
+    close AUX;
+}
+
 # Now retrieve the complete list of objects and resource files, and
 # construct dependency data for them. While we're here, expand the
 # object list for each program, and complain if its type isn't set.
@@ -422,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
@@ -442,7 +453,7 @@ if (defined $makefiles{'cygwin'}) {
     "# RCINC = --include-dir c:\\cygwin\\include\\\n".
     "\n".
     &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-      " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " .
+      " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP -DNO_SECUREZEROMEMORY " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs)) .
 	       "\n".
     "LDFLAGS = -mno-cygwin -s\n".
@@ -473,7 +484,7 @@ if (defined $makefiles{'cygwin'}) {
                          join " ", @{$d->{deps}})), "\n";
       }
       if ($d->{obj} =~ /\.res\.o$/) {
-	  print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
+	  print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n";
       } else {
 	  print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n";
       }
@@ -1144,7 +1155,10 @@ if (defined $makefiles{'am'}) {
       $objtosrc{$d->{obj}} = $d->{deps}->[0];
     }
 
-    @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", 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";
@@ -1539,8 +1553,10 @@ if ($do_unix) {
     chdir $orig_dir;
     system "./mkauto.sh";
     die "mkfiles.pl: mkauto.sh returned $?\n" if $? > 0;
-    chdir ($targetdir = dirname($makefiles{"am"}))
-        or die "$targetdir: chdir: $!\n";
+    if ($do_unix == 1) {
+        chdir ($targetdir = dirname($makefiles{"am"}))
+            or die "$targetdir: chdir: $!\n";
+    }
     system "./configure", @confargs;
     die "mkfiles.pl: configure returned $?\n" if $? > 0;
 }