X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mkfiles.pl;h=46ae3189985639de744429c174763db9a6203e88;hb=a1e622523e48125b7322cf4e53d504b9a6614c15;hp=342db4d0a965db406c663b71cc543d94fc681601;hpb=442627408fc562f99c90a306ef66a652fca5b55b;p=PuTTY.git diff --git a/mkfiles.pl b/mkfiles.pl index 342db4d0..46ae3189 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -132,9 +132,10 @@ while () { $i = shift @objs; if ($groups{$i}) { foreach $j (@{$groups{$i}}) { unshift @objs, $j; } - } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[M]" or - $i eq "[X]" or $i eq "[U]" or $i eq "[MX]") and defined $prog) { + } elsif (($i =~ /^\[([A-Z]*)\]$/) and defined $prog) { $type = substr($i,1,(length $i)-2); + die "unrecognised program type for $prog [$type]\n" + if ! grep { $type eq $_ } qw(G C X U MX XT UT); } else { push @$listref, $i; } @@ -643,63 +644,76 @@ if (defined $makefiles{'vc'}) { &def($makefile_extra{'vc'}->{'vars'}) . "\n". "\n"; - print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C")); + print &splitline("all:" . join "", map { " \$(BUILDDIR)$_.exe" } &progrealnames("G:C")); print "\n\n"; foreach $p (&prognames("G:C")) { ($prog, $type) = split ",", $p; - $objstr = &objects($p, "X.obj", "X.res", undef); - print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n"; - print "\tlink \$(LFLAGS) \$(XLFLAGS) -out:$prog.exe -map:$prog.map \@$prog.rsp\n\n"; - } - foreach $p (&prognames("G:C")) { - ($prog, $type) = split ",", $p; - print $prog, ".rsp: \$(MAKEFILE)\n"; - $objstr = &objects($p, "X.obj", "X.res", "X.lib"); + $objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", undef); + print &splitline("\$(BUILDDIR)$prog.exe: " . $objstr), "\n"; + + $objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", "X.lib"); + $subsys = ($type eq "G") ? "windows" : "console"; + $inlinefilename = "link_$prog"; + print "\ttype <<$inlinefilename\n"; @objlist = split " ", $objstr; @objlines = (""); foreach $i (@objlist) { - if (length($objlines[$#objlines] . " $i") > 50) { + if (length($objlines[$#objlines] . " $i") > 72) { push @objlines, ""; } $objlines[$#objlines] .= " $i"; } - $subsys = ($type eq "G") ? "windows" : "console"; - print "\techo /nologo /subsystem:$subsys > $prog.rsp\n"; for ($i=0; $i<=$#objlines; $i++) { - print "\techo$objlines[$i] >> $prog.rsp\n"; + print "$objlines[$i]\n"; } - print "\n"; + print "<<\n"; + print "\tlink \$(LFLAGS) \$(XLFLAGS) -out:\$(BUILDDIR)$prog.exe -map:\$(BUILDDIR)$prog.map -nologo -subsystem:$subsys \@$inlinefilename\n\n"; } - foreach $d (&deps("X.obj", "X.res", $dirpfx, "\\", "vc")) { + foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", $dirpfx, "\\", "vc")) { $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : []; print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @$extradeps, @{$d->{deps}})), "\n"; - if ($d->{obj} =~ /.obj$/) { - print "\tcl \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c ".$d->{deps}->[0],"\n\n"; - } else { - print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n"; + if ($d->{obj} =~ /.res$/) { + print "\trc /Fo@{[$d->{obj}]} \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n"; } } print "\n"; + foreach $real_srcdir ("", @srcdirs) { + $srcdir = $real_srcdir; + if ($srcdir ne "") { + $srcdir =~ s!/!\\!g; + $srcdir = $dirpfx . $srcdir; + $srcdir =~ s!\\\.\\!\\!; + $srcdir = "{$srcdir}"; + } + # The double colon at the end of the line makes this a + # 'batch-mode inference rule', which means that nmake will + # aggregate multiple invocations of the rule and issue just + # one cl command with multiple source-file arguments. That + # noticeably speeds up builds, since starting up the cl + # process is a noticeable overhead and now has to be done far + # fewer times. + print "${srcdir}.c.obj::\n\tcl /Fo\$(BUILDDIR) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c \$<\n\n"; + } print &def($makefile_extra{'vc'}->{'end'}); print "\nclean: tidy\n". - "\t-del *.exe\n\n". + "\t-del \$(BUILDDIR)*.exe\n\n". "tidy:\n". - "\t-del *.obj\n". - "\t-del *.res\n". - "\t-del *.pch\n". - "\t-del *.aps\n". - "\t-del *.ilk\n". - "\t-del *.pdb\n". - "\t-del *.rsp\n". - "\t-del *.dsp\n". - "\t-del *.dsw\n". - "\t-del *.ncb\n". - "\t-del *.opt\n". - "\t-del *.plg\n". - "\t-del *.map\n". - "\t-del *.idb\n". - "\t-del debug.log\n"; + "\t-del \$(BUILDDIR)*.obj\n". + "\t-del \$(BUILDDIR)*.res\n". + "\t-del \$(BUILDDIR)*.pch\n". + "\t-del \$(BUILDDIR)*.aps\n". + "\t-del \$(BUILDDIR)*.ilk\n". + "\t-del \$(BUILDDIR)*.pdb\n". + "\t-del \$(BUILDDIR)*.rsp\n". + "\t-del \$(BUILDDIR)*.dsp\n". + "\t-del \$(BUILDDIR)*.dsw\n". + "\t-del \$(BUILDDIR)*.ncb\n". + "\t-del \$(BUILDDIR)*.opt\n". + "\t-del \$(BUILDDIR)*.plg\n". + "\t-del \$(BUILDDIR)*.map\n". + "\t-del \$(BUILDDIR)*.idb\n". + "\t-del \$(BUILDDIR)debug.log\n"; select STDOUT; close OUT; } @@ -1343,7 +1357,7 @@ if (defined $makefiles{'gtk'}) { "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0 x11'\n". "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n". "# to 1.2 if it isn't found.\n". - "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 x11 \$\$0 2>/dev/null || gtk-config \$\$0'\n". + "GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 x11 \$\$0 2>/dev/null || pkg-config gtk+-2.0 x11 \$\$0 2>/dev/null || gtk-config \$\$0'\n". "\n". "-include Makefile.local\n". "\n". @@ -1379,15 +1393,17 @@ if (defined $makefiles{'gtk'}) { ".SUFFIXES:\n". "\n". "\n"; - print &splitline("all:" . join "", map { " $_" } &progrealnames("X:U")); + print &splitline("all:" . join "", map { " $_" } + &progrealnames("X:XT:U:UT")); print "\n\n"; - foreach $p (&prognames("X:U")) { + foreach $p (&prognames("X:XT:U:UT")) { ($prog, $type) = split ",", $p; + ($ldflags = $type) =~ s/T$//; $objstr = &objects($p, "X.o", undef, undef); print &splitline($prog . ": " . $objstr), "\n"; $libstr = &objects($p, undef, undef, "-lX"); print &splitline("\t\$(CC) -o \$@ " . - $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n"; + $objstr . " \$(${ldflags}LDFLAGS) $libstr", 69), "\n\n"; } foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) { if ($forceobj{$d->{obj_orig}}) { @@ -1401,7 +1417,7 @@ if (defined $makefiles{'gtk'}) { print "\n"; print &def($makefile_extra{'gtk'}->{'end'}); print "\nclean:\n". - "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n"; + "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:XT:U:UT")) . "\n"; print "\nFORCE:\n"; select STDOUT; close OUT; } @@ -1446,9 +1462,9 @@ if (defined $makefiles{'unix'}) { ".SUFFIXES:\n". "\n". "\n"; - print &splitline("all:" . join "", map { " $_" } &progrealnames("U")); + print &splitline("all:" . join "", map { " $_" } &progrealnames("U:UT")); print "\n\n"; - foreach $p (&prognames("U")) { + foreach $p (&prognames("U:UT")) { ($prog, $type) = split ",", $p; $objstr = &objects($p, "X.o", undef, undef); print &splitline($prog . ": " . $objstr), "\n"; @@ -1468,7 +1484,7 @@ if (defined $makefiles{'unix'}) { print "\n"; print &def($makefile_extra{'unix'}->{'end'}); print "\nclean:\n". - "\trm -f *.o". (join "", map { " $_" } &progrealnames("U")) . "\n"; + "\trm -f *.o". (join "", map { " $_" } &progrealnames("U:UT")) . "\n"; print "\nFORCE:\n"; select STDOUT; close OUT; } @@ -1511,6 +1527,13 @@ if (defined $makefiles{'am'}) { print &splitline(join " ", @cliprogs), "\n"; print "endif\n\n"; + @noinstcliprogs = ("noinst_PROGRAMS", "="); + foreach $p (&prognames("XT:UT")) { + ($prog, $type) = split ",", $p; + push @noinstcliprogs, $prog; + } + print &splitline(join " ", @noinstcliprogs), "\n"; + %objtosrc = (); foreach $d (&deps("X", undef, "", "/", "am")) { $objtosrc{$d->{obj}} = $d->{deps}->[0]; @@ -1537,9 +1560,9 @@ if (defined $makefiles{'am'}) { print &splitline(join " ", "noinst_LIBRARIES", "=", sort { $a cmp $b } values %amspeciallibs), "\n\n"; - foreach $p (&prognames("X:U")) { + foreach $p (&prognames("X:XT:U:UT")) { ($prog, $type) = split ",", $p; - print "if HAVE_GTK\n" if $type eq "X"; + print "if HAVE_GTK\n" if $type eq "X" || $type eq "XT"; @progsources = ("${prog}_SOURCES", "="); %sourcefiles = (); @ldadd = (); @@ -1553,13 +1576,13 @@ if (defined $makefiles{'am'}) { } push @progsources, sort { $a cmp $b } keys %sourcefiles; print &splitline(join " ", @progsources), "\n"; - if ($type eq "X") { + if ($type eq "X" || $type eq "XT") { push @ldadd, "\$(GTK_LIBS)"; } if (@ldadd) { print &splitline(join " ", "${prog}_LDADD", "=", @ldadd), "\n"; } - print "endif\n" if $type eq "X"; + print "endif\n" if $type eq "X" || $type eq "XT"; print "\n"; } print &def($makefile_extra{'am'}->{'end'}); @@ -1657,7 +1680,7 @@ if (defined $makefiles{'osx'}) { "\n" . &def($makefile_extra{'osx'}->{'vars'}) . "\n" . - &splitline("all:" . join "", map { " $_" } &progrealnames("MX:U")) . + &splitline("all:" . join "", map { " $_" } &progrealnames("MX:U:UT")) . "\n"; foreach $p (&prognames("MX")) { ($prog, $type) = split ",", $p; @@ -1685,7 +1708,7 @@ if (defined $makefiles{'osx'}) { print &splitline("\t\$(CC) \$(MLDFLAGS) -o \$@ " . $objstr . " $libstr", 69), "\n\n"; } - foreach $p (&prognames("U")) { + foreach $p (&prognames("U:UT")) { ($prog, $type) = split ",", $p; $objstr = &objects($p, "X.o", undef, undef); print &splitline($prog . ": " . $objstr), "\n"; @@ -1709,7 +1732,7 @@ if (defined $makefiles{'osx'}) { } print "\n".&def($makefile_extra{'osx'}->{'end'}); print "\nclean:\n". - "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n". + "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U:UT")) . "\n". "\trm -rf *.app\n". "\n". "FORCE:\n";