X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7603011ffb29db85f110a003f5c1478daab496be..68a49acbf3f96fbbbc385620655dcb577e62c328:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index ba1cf9ea..a669d21e 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -7,11 +7,14 @@
 # files to compute #include dependencies. Finally, writes out the
 # various target Makefiles.
 
+use FileHandle;
+
 open IN, "Recipe" or die "unable to open Recipe file\n";
 
+@incdirs = ("", "unix/");
+
 $help = ""; # list of newline-free lines of help text
-%programs = (); # maps program name to listref of objects/resources
-%types = (); # maps program name to "G" or "C"
+%programs = (); # maps prog name + type letter to listref of objects/resources
 %groups = (); # maps group name to listref of objects/resources
 
 while (<IN>) {
@@ -42,8 +45,7 @@ while (<IN>) {
     $prog = undef;
     shift @objs; # eat the group name
   } elsif ($_[1] eq ":") {
-    $programs{$_[0]} = [] if !defined $programs{$_[0]};
-    $listref = $programs{$_[0]};
+    $listref = [];
     $prog = $_[0];
     shift @objs; # eat the program name
   } else {
@@ -55,12 +57,17 @@ while (<IN>) {
     $i = shift @objs;
     if ($groups{$i}) {
       foreach $j (@{$groups{$i}}) { unshift @objs, $j; }
-    } elsif (($i eq "[G]" or $i eq "[C]") and defined $prog) {
-      $types{$prog} = substr($i,1,1);
+    } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[X]") and defined $prog) {
+      $type = substr($i,1,1);
     } else {
       push @$listref, $i;
     }
   }
+  if ($prog and $type) {
+    die "multiple program entries for $prog [$type]\n"
+	if defined $programs{$prog . "," . $type};
+    $programs{$prog . "," . $type} = $listref;
+  }
   $lastlistref = $listref;
 }
 
@@ -73,7 +80,7 @@ close IN;
 %depends = ();
 @scanlist = ();
 foreach $i (@prognames) {
-  if (!defined $types{$i}) { die "type not set for program $i\n"; }
+  ($prog, $type) = split ",", $i;
   # Strip duplicate object names.
   $prev = undef;
   @list = grep { $status = ($prev ne $_); $prev=$_; $status }
@@ -118,7 +125,8 @@ while (scalar @scanlist > 0) {
   next if defined $further{$file}; # skip if we've already done it
   $resource = ($file =~ /\.rc$/ ? 1 : 0);
   $further{$file} = [];
-  open IN, $file or die "unable to open source file $file\n";
+  $dirfile = &findfile($file);
+  open IN, "$dirfile" or die "unable to open source file $file\n";
   while (<IN>) {
     chomp;
     /^\s*#include\s+\"([^\"]+)\"/ and do {
@@ -156,24 +164,34 @@ foreach $i (keys %depends) {
 
 # Utility routines while writing out the Makefiles.
 
+sub findfile {
+  my ($name) = @_;
+  my $dir, $i, $outdir = "";
+  $i = 0;
+  foreach $dir (@incdirs) {
+    $outdir = $dir, $i++ if -f "$dir$name";
+  }
+  die "multiple instances of source file $name\n" if $i > 1;
+  return "$outdir$name";
+}
+
 sub objects {
-  my ($prog, $otmpl, $rtmpl, $ltmpl) = @_;
+  my ($prog, $otmpl, $rtmpl, $ltmpl, $prefix, $dirsep) = @_;
   my @ret;
   my ($i, $x, $y);
   @ret = ();
   foreach $i (@{$programs{$prog}}) {
+    $x = "";
     if ($i =~ /^(.*)\.res/) {
       $y = $1;
       ($x = $rtmpl) =~ s/X/$y/;
-      push @ret, $x if $x ne "";
     } elsif ($i =~ /^(.*)\.lib/) {
       $y = $1;
       ($x = $ltmpl) =~ s/X/$y/;
-      push @ret, $x if $x ne "";
     } else {
       ($x = $otmpl) =~ s/X/$i/;
-      push @ret, $x if $x ne "";
     }
+    push @ret, $x if $x ne "";
   }
   return join " ", @ret;
 }
@@ -192,19 +210,51 @@ sub splitline {
 }
 
 sub deps {
-  my ($otmpl, $rtmpl) = @_;
+  my ($otmpl, $rtmpl, $prefix, $dirsep) = @_;
   my ($i, $x, $y);
+  my @deps;
   foreach $i (sort keys %depends) {
     if ($i =~ /^(.*)\.res/) {
+      next if !defined $rtmpl;
       $y = $1;
       ($x = $rtmpl) =~ s/X/$y/;
     } else {
       ($x = $otmpl) =~ s/X/$i/;
     }
-    print &splitline(sprintf "%s: %s", $x, join " ", @{$depends{$i}}), "\n";
+    @deps = @{$depends{$i}};
+    @deps = map {
+      $_ = &findfile($_);
+      s/\//$dirsep/g;
+      $_ = $prefix . $_;
+    } @deps;
+    print &splitline(sprintf "%s: %s", $x, join " ", @deps), "\n";
   }
 }
 
+sub prognames {
+  my ($types) = @_;
+  my ($n, $prog, $type);
+  my @ret;
+  @ret = ();
+  foreach $n (@prognames) {
+    ($prog, $type) = split ",", $n;
+    push @ret, $n if index($types, $type) >= 0;
+  }
+  return @ret;
+}
+
+sub progrealnames {
+  my ($types) = @_;
+  my ($n, $prog, $type);
+  my @ret;
+  @ret = ();
+  foreach $n (@prognames) {
+    ($prog, $type) = split ",", $n;
+    push @ret, $prog if index($types, $type) >= 0;
+  }
+  return @ret;
+}
+
 # Now we're ready to output the actual Makefiles.
 
 ##-- CygWin makefile
@@ -240,17 +290,18 @@ print
 "%.res.o: %.rc\n".
 "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } @prognames);
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
-foreach $p (@prognames) {
+foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.o", "X.res.o", undef);
-  print &splitline($p . ".exe: " . $objstr), "\n";
-  my $mw = $types{$p} eq "G" ? " -mwindows" : "";
+  print &splitline($prog . ".exe: " . $objstr), "\n";
+  my $mw = $type eq "G" ? " -mwindows" : "";
   $libstr = &objects($p, undef, undef, "-lX");
   print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
                    $objstr . " $libstr", 69), "\n\n";
 }
-&deps("X.o", "X.res.o");
+&deps("X.o", "X.res.o", "", "/");
 print
 "\n".
 "version.o: FORCE;\n".
@@ -298,22 +349,24 @@ print
 "!endif\n".
 "\n".
 ".c.obj:\n".
-&splitline("\tbcc32 -w-aus -w-ccc -w-par \$(COMPAT) \$(FWHACK)".
+&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT) \$(FWHACK)".
   " \$(XFLAGS) \$(CFLAGS) /c \$*.c",69)."\n".
 ".rc.res:\n".
 &splitline("\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include -r".
   " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } @prognames);
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
-foreach $p (@prognames) {
+foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.obj", "X.res", undef);
-  print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n";
-  my $ap = ($types{$p} eq "G") ? "-aa" : "-ap";
-  print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$p.rsp\n\n";
+  print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
+  my $ap = ($type eq "G") ? "-aa" : "-ap";
+  print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$prog.rsp\n\n";
 }
-foreach $p (@prognames) {
-  print $p, ".rsp: \$(MAKEFILE)\n";
+foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
+  print $prog, ".rsp: \$(MAKEFILE)\n";
   $objstr = &objects($p, "X.obj", undef, undef);
   @objlist = split " ", $objstr;
   @objlines = ("");
@@ -323,23 +376,23 @@ foreach $p (@prognames) {
     }
     $objlines[$#objlines] .= " $i";
   }
-  $c0w = ($types{$p} eq "G") ? "c0w32" : "c0x32";
-  print "\techo $c0w + > $p.rsp\n";
+  $c0w = ($type eq "G") ? "c0w32" : "c0x32";
+  print "\techo $c0w + > $prog.rsp\n";
   for ($i=0; $i<=$#objlines; $i++) {
     $plus = ($i < $#objlines ? " +" : "");
-    print "\techo$objlines[$i]$plus >> $p.rsp\n";
+    print "\techo$objlines[$i]$plus >> $prog.rsp\n";
   }
-  print "\techo $p.exe >> $p.rsp\n";
+  print "\techo $prog.exe >> $prog.rsp\n";
   $objstr = &objects($p, "X.obj", "X.res", undef);
   @libs = split " ", &objects($p, undef, undef, "X");
   @libs = grep { !$stdlibs{$_} } @libs;
   unshift @libs, "cw32", "import32";
   $libstr = join ' ', @libs;
-  print "\techo nul,$libstr, >> $p.rsp\n";
-  print "\techo " . &objects($p, undef, "X.res", undef) . " >> $p.rsp\n";
+  print "\techo nul,$libstr, >> $prog.rsp\n";
+  print "\techo " . &objects($p, undef, "X.res", undef) . " >> $prog.rsp\n";
   print "\n";
 }
-&deps("X.obj", "X.res");
+&deps("X.obj", "X.res", "", "\\");
 print
 "\n".
 "version.o: FORCE\n".
@@ -381,15 +434,17 @@ print
 ".rc.res:\n".
 "\trc \$(FWHACK) \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } @prognames);
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
-foreach $p (@prognames) {
+foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.obj", "X.res", undef);
-  print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n";
-  print "\tlink \$(LFLAGS) -out:$p.exe -map:$p.map \@$p.rsp\n\n";
+  print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
+  print "\tlink \$(LFLAGS) -out:$prog.exe -map:$prog.map \@$prog.rsp\n\n";
 }
-foreach $p (@prognames) {
-  print $p, ".rsp: \$(MAKEFILE)\n";
+foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
+  print $prog, ".rsp: \$(MAKEFILE)\n";
   $objstr = &objects($p, "X.obj", "X.res", "X.lib");
   @objlist = split " ", $objstr;
   @objlines = ("");
@@ -399,14 +454,14 @@ foreach $p (@prognames) {
     }
     $objlines[$#objlines] .= " $i";
   }
-  $subsys = ($types{$p} eq "G") ? "windows" : "console";
-  print "\techo /nologo /subsystem:$subsys > $p.rsp\n";
+  $subsys = ($type eq "G") ? "windows" : "console";
+  print "\techo /nologo /subsystem:$subsys > $prog.rsp\n";
   for ($i=0; $i<=$#objlines; $i++) {
-    print "\techo$objlines[$i] >> $p.rsp\n";
+    print "\techo$objlines[$i] >> $prog.rsp\n";
   }
   print "\n";
 }
-&deps("X.obj", "X.res");
+&deps("X.obj", "X.res", "", "\\");
 print
 "\n".
 "# Hack to force version.o to be rebuilt always\n".
@@ -431,3 +486,48 @@ print
 "\t-del *.idb\n".
 "\t-del debug.log\n";
 select STDOUT; close OUT;
+
+##-- X/GTK/Unix makefile
+open OUT, ">unix/Makefile.gtk"; select OUT;
+print
+"# Makefile for PuTTY under X/GTK and Unix.\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
+($_ = $help) =~ s/=\/D/=-D/gs;
+print $_;
+print
+"\n".
+"# You can define this path to point at your tools if you need to\n".
+"# TOOLPATH = /opt/gcc/bin\n".
+"CC = \$(TOOLPATH)cc\n".
+"\n".
+&splitline("CFLAGS = -Wall -g -I. -I.. `gtk-config --cflags`")."\n".
+"LDFLAGS = `gtk-config --libs`\n".
+"\n".
+".SUFFIXES:\n".
+"\n".
+"%.o:\n".
+"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n".
+"\n";
+print &splitline("all:" . join "", map { " $_" } &progrealnames("X"));
+print "\n\n";
+foreach $p (&prognames("X")) {
+  ($prog, $type) = split ",", $p;
+  $objstr = &objects($p, "X.o", undef, undef);
+  print &splitline($prog . ": " . $objstr), "\n";
+  $libstr = &objects($p, undef, undef, "-lX");
+  print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
+                   $objstr . " $libstr", 69), "\n\n";
+}
+&deps("X.o", undef, "../", "/");
+print
+"\n".
+"version.o: FORCE;\n".
+"# Hack to force version.o to be rebuilt always\n".
+"FORCE:\n".
+"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c ../version.c\n".
+"clean:\n".
+"\trm -f *.o". (join "", map { " $_" } &progrealnames("X")) . "\n".
+"\n";
+select STDOUT; close OUT;