So _that's_ why mkfiles.pl was running so slowly on my Windows box!

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index ff2ebdc..652d2ec 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
@@ -178,12 +184,15 @@ foreach $i (keys %depends) {
 sub findfile {
   my ($name) = @_;
   my $dir, $i, $outdir = "";
-  $i = 0;
-  foreach $dir (@incdirs) {
-    $outdir = $dir, $i++ if -f "$dir$name";
+  unless (defined $findfilecache{$name}) {
+    $i = 0;
+    foreach $dir (@incdirs) {
+      $outdir = $dir, $i++ if -f "$dir$name";
+    }
+    die "multiple instances of source file $name\n" if $i > 1;
+    $findfilecache{$name} = $outdir . $name;
   }
-  die "multiple instances of source file $name\n" if $i > 1;
-  return "$outdir$name";
+  return $findfilecache{$name};
 }
 
 sub objects {
@@ -305,7 +314,7 @@ print
 "# RCINC = --include-dir c:\\cygwin\\include\\\n".
 "\n".
 &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-  " -DNO_SECURITY -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
+  " -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
 "LDFLAGS = -mno-cygwin -s\n".
 &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
   " --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
@@ -539,7 +548,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",
@@ -580,8 +589,8 @@ print
 "\trm -f *.o". (join "", map { " $_" } &progrealnames("XU")) . "\n".
 "\n",
 "install:\n",
-map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(bindir)/$_\n", &progrealnames("XU")),
-map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")),
+map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(DESTDIR)\$(bindir)/$_\n", &progrealnames("XU")),
+map("\t\$(INSTALL_DATA) -m 644 $_ \$(DESTDIR)\$(man1dir)/$_\n", &manpages("XU", "1")),
 "\n",
 "install-strip:\n",
 "\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n",
@@ -623,7 +632,7 @@ Link_CFM68K = ILink
 Link_PPC = PPCLink
 Link_Carbon = PPCLink
 
-LinkOptions = -c 'pTTY' -fragname PuTTY
+LinkOptions = -c 'pTTY'
 LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
 LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
 LinkOptions_PPC = {LinkOptions}
@@ -682,17 +691,18 @@ print "\n\n";
 foreach $p (&prognames("M")) {
   ($prog, $type) = split ",", $p;
 
-  print &splitline("$prog \xc4 $prog.68k $prog.ppc",
+  print &splitline("$prog \xc4 $prog.68k $prog.ppc $prog.carbon",
                   undef, "\xb6"), "\n\n";
 
   $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";
       print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
-      print &splitline("\t{Link_$arch} -o {Targ} {LinkOptions_$arch} " .
+      print &splitline("\t{Link_$arch} -o {Targ} -fragname $prog " .
+                      "{LinkOptions_$arch} " .
                       $objstr . " {Libs_$arch}", 69, "\xb6"), "\n";
       print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
   }
@@ -704,7 +714,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},
@@ -714,7 +724,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},