Unix makefile now uses -O2, which massively cuts down key exchange

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 63cbe0e..422b8b0 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -9,7 +9,13 @@
 
 use FileHandle;
 
-open IN, "Recipe" or die "unable to open Recipe file\n";
+open IN, "Recipe" or do {
+    # We want to deal correctly with being run from one of the
+    # subdirs in the source tree. So if we can't find Recipe here,
+    # try one level up.
+    chdir "..";
+    open IN, "Recipe" or die "unable to open Recipe file\n";
+};
 
 # HACK: One of the source files in `charset' is auto-generated by
 # sbcsgen.pl. We need to generate that _now_, before attempting
@@ -539,7 +545,7 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
+&splitline("CFLAGS = -O2 -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
 "XLDFLAGS = `gtk-config --libs`\n".
 "ULDFLAGS =#\n".
 "INSTALL=install\n",
@@ -687,7 +693,7 @@ foreach $p (&prognames("M")) {
 
   $rsrc = &objects($p, "", "X.rsrc", undef);
 
-  foreach $arch qw(68K CFM68K PPC Carbon) {
+  foreach $arch (qw(68K CFM68K PPC Carbon)) {
       $objstr = &objects($p, "X.\L$arch\E.o", "", undef);
       print &splitline("$prog.\L$arch\E \xc4 $objstr $rsrc", undef, "\xb6");
       print "\n";
@@ -705,7 +711,7 @@ foreach $d (&deps("", "X.rsrc", "::", ":")) {
                   undef, "\xb6"), "\n";
   print "\tRez ", $d->{deps}->[0], " -o {Targ} {ROptions}\n\n";
 }
-foreach $arch qw(68K CFM68K) {
+foreach $arch (qw(68K CFM68K)) {
     foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
         next unless $d->{obj};
        print &splitline(sprintf("%s \xc4 %s", $d->{obj},
@@ -715,7 +721,7 @@ foreach $arch qw(68K CFM68K) {
               " -o {Targ} {COptions_$arch}\n\n";
      }
 }
-foreach $arch qw(PPC Carbon) {
+foreach $arch (qw(PPC Carbon)) {
     foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
         next unless $d->{obj};
        print &splitline(sprintf("%s \xc4 %s", $d->{obj},