zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Patch inspired by one from James H: remove spurious references to

Browse Source 
$mw (it should only ever have been used in the Cygwin makefile), and
move the libraries to the end of the link line in the Unix makefile
for better portability.

[originally from svn r8853]
This commit is contained in:
Simon Tatham
2010-01-19 00:56:37 +00:00
parent f55dc67f43
commit b0ad387d05
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mkfiles.pl
View File

@ -1111,8 +1111,8 @@ if (defined $makefiles{'gtk'}) {
&splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " . &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) . (join " ", map {"-I$dirpfx$_"} @srcdirs) .
" `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n". " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
"XLDFLAGS = `\$(GTK_CONFIG) --libs`\n". "XLIBS = `\$(GTK_CONFIG) --libs`\n".
"ULDFLAGS =#\n". "ULIBS =#\n".
"INSTALL=install\n", "INSTALL=install\n",
"INSTALL_PROGRAM=\$(INSTALL)\n", "INSTALL_PROGRAM=\$(INSTALL)\n",
"INSTALL_DATA=\$(INSTALL)\n", "INSTALL_DATA=\$(INSTALL)\n",
@ -1130,8 +1130,8 @@ if (defined $makefiles{'gtk'}) {
$objstr = &objects($p, "X.o", undef, undef); $objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n"; print &splitline($prog . ": " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX"); $libstr = &objects($p, undef, undef, "-lX");
print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " . print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(${type}LIBS)", 69),
$objstr . " $libstr", 69), "\n\n"; "\n\n";
} }
foreach $d (&deps("X.o", undef, $dirpfx, "/")) { foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
@ -1380,7 +1380,7 @@ if (defined $makefiles{'nestedvm'}) {
$objstr =~ s/gtk\.o/nestedvm\.o/g; $objstr =~ s/gtk\.o/nestedvm\.o/g;
print &splitline($prog . ".mips: " . $objstr), "\n"; print &splitline($prog . ".mips: " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX"); $libstr = &objects($p, undef, undef, "-lX");
print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " . print &splitline("\t\$(CC) \$(${type}LDFLAGS) -o \$@ " .
$objstr . " $libstr -lm", 69), "\n\n"; $objstr . " $libstr -lm", 69), "\n\n";
} }
foreach $d (&deps("X.o", undef, $dirpfx, "/")) { foreach $d (&deps("X.o", undef, $dirpfx, "/")) {