nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

New program type [XT] in Recipe.

Browse Source 
This is to [X] what [UT] is to [U]: that is, it's a program linked
against the GTK libraries, but one which doesn't become part of the
'make install' set. I'll use this for the individual binaries that
will go in the OS X application bundles, and then have another
makefile rule pick those up in turn.
This commit is contained in:
Simon Tatham 2016-03-23 22:01:10 +00:00
parent 01778a2d54
commit 1af3bd927f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mkfiles.pl
View File

@ -135,7 +135,7 @@ while (<IN>) {
} elsif (($i =~ /^\[([A-Z]*)\]$/) and defined $prog) { } elsif (($i =~ /^\[([A-Z]*)\]$/) and defined $prog) {
$type = substr($i,1,(length $i)-2); $type = substr($i,1,(length $i)-2);
die "unrecognised program type for $prog [$type]\n" die "unrecognised program type for $prog [$type]\n"
if ! grep { $type eq $_ } qw(G C X U MX UT); if ! grep { $type eq $_ } qw(G C X U MX XT UT);
} else { } else {
push @$listref, $i; push @$listref, $i;
} }
@ -1393,9 +1393,10 @@ if (defined $makefiles{'gtk'}) {
".SUFFIXES:\n". ".SUFFIXES:\n".
"\n". "\n".
"\n"; "\n";
print &splitline("all:" . join "", map { " $_" } &progrealnames("X:U:UT")); print &splitline("all:" . join "", map { " $_" }
&progrealnames("X:XT:U:UT"));
print "\n\n"; print "\n\n";
foreach $p (&prognames("X:U:UT")) { foreach $p (&prognames("X:XT:U:UT")) {
($prog, $type) = split ",", $p; ($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.o", undef, undef); $objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n"; print &splitline($prog . ": " . $objstr), "\n";
@ -1415,7 +1416,7 @@ if (defined $makefiles{'gtk'}) {
print "\n"; print "\n";
print &def($makefile_extra{'gtk'}->{'end'}); print &def($makefile_extra{'gtk'}->{'end'});
print "\nclean:\n". print "\nclean:\n".
"\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U:UT")) . "\n"; "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:XT:U:UT")) . "\n";
print "\nFORCE:\n"; print "\nFORCE:\n";
select STDOUT; close OUT; select STDOUT; close OUT;
} }
@ -1526,7 +1527,7 @@ if (defined $makefiles{'am'}) {
print "endif\n\n"; print "endif\n\n";
@noinstcliprogs = ("noinst_PROGRAMS", "="); @noinstcliprogs = ("noinst_PROGRAMS", "=");
foreach $p (&prognames("UT")) { foreach $p (&prognames("XT:UT")) {
($prog, $type) = split ",", $p; ($prog, $type) = split ",", $p;
push @noinstcliprogs, $prog; push @noinstcliprogs, $prog;
} }
@ -1558,9 +1559,9 @@ if (defined $makefiles{'am'}) {
print &splitline(join " ", "noinst_LIBRARIES", "=", print &splitline(join " ", "noinst_LIBRARIES", "=",
sort { $a cmp $b } values %amspeciallibs), "\n\n"; sort { $a cmp $b } values %amspeciallibs), "\n\n";
foreach $p (&prognames("X:U:UT")) { foreach $p (&prognames("X:XT:U:UT")) {
($prog, $type) = split ",", $p; ($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", "="); @progsources = ("${prog}_SOURCES", "=");
%sourcefiles = (); %sourcefiles = ();
@ldadd = (); @ldadd = ();
@ -1574,13 +1575,13 @@ if (defined $makefiles{'am'}) {
} }
push @progsources, sort { $a cmp $b } keys %sourcefiles; push @progsources, sort { $a cmp $b } keys %sourcefiles;
print &splitline(join " ", @progsources), "\n"; print &splitline(join " ", @progsources), "\n";
if ($type eq "X") { if ($type eq "X" || $type eq "XT") {
push @ldadd, "\$(GTK_LIBS)"; push @ldadd, "\$(GTK_LIBS)";
} }
if (@ldadd) { if (@ldadd) {
print &splitline(join " ", "${prog}_LDADD", "=", @ldadd), "\n"; 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 "\n";
} }
print &def($makefile_extra{'am'}->{'end'}); print &def($makefile_extra{'am'}->{'end'});