mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
This reordering of the Unix Makefiles (requested by Michael Shigorin) allows
use of -Wl,--as-needed. [originally from svn r7299]
This commit is contained in:
parent
0407960951
commit
0f013108c3
12
mkfiles.pl
12
mkfiles.pl
@ -929,8 +929,8 @@ if (defined $makefiles{'gtk'}) {
|
||||
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
|
||||
" `gtk-config --cflags`").
|
||||
" -D _FILE_OFFSET_BITS=64\n".
|
||||
"XLDFLAGS = `gtk-config --libs`\n".
|
||||
"ULDFLAGS =#\n".
|
||||
"XLDFLAGS = \$(LDFLAGS) `gtk-config --libs`\n".
|
||||
"ULDFLAGS = \$(LDFLAGS)\n".
|
||||
"INSTALL=install\n",
|
||||
"INSTALL_PROGRAM=\$(INSTALL)\n",
|
||||
"INSTALL_DATA=\$(INSTALL)\n",
|
||||
@ -952,8 +952,8 @@ if (defined $makefiles{'gtk'}) {
|
||||
$objstr = &objects($p, "X.o", undef, undef);
|
||||
print &splitline($prog . ": " . $objstr), "\n";
|
||||
$libstr = &objects($p, undef, undef, "-lX");
|
||||
print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
|
||||
$objstr . " $libstr", 69), "\n\n";
|
||||
print &splitline("\t\$(CC)" . $mw . " -o \$@ " .
|
||||
$objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
|
||||
}
|
||||
foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
|
||||
if ($forceobj{$d->{obj_orig}}) {
|
||||
@ -1015,8 +1015,8 @@ if (defined $makefiles{'ac'}) {
|
||||
$objstr = &objects($p, "X.o", undef, undef);
|
||||
print &splitline($prog . ": " . $objstr), "\n";
|
||||
$libstr = &objects($p, undef, undef, "-lX");
|
||||
print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
|
||||
$objstr . " $libstr", 69), "\n\n";
|
||||
print &splitline("\t\$(CC)" . $mw . " -o \$@ " .
|
||||
$objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
|
||||
}
|
||||
foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
|
||||
if ($forceobj{$d->{obj_orig}}) {
|
||||
|
Loading…
Reference in New Issue
Block a user