From 0dbe2956906807a76c9a51f9356698bc816897bc Mon Sep 17 00:00:00 2001 From: jacob Date: Sun, 18 Feb 2007 22:05:45 +0000 Subject: [PATCH] This reordering of the Unix Makefiles (requested by Michael Shigorin) allows use of -Wl,--as-needed. git-svn-id: svn://svn.tartarus.org/sgt/putty@7299 cda61777-01e9-0310-a592-d414129be87e --- mkfiles.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkfiles.pl b/mkfiles.pl index 94a83c7c..d43551b3 100755 --- a/mkfiles.pl +++ b/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}}) { -- 2.11.0