Patch from Frode Austvik to permit passing CFLAGS in to the Unix

makefile.

[originally from svn r8782]
This commit is contained in:
Simon Tatham
2009-12-17 17:55:42 +00:00
parent 525370a569
commit 84d48aa074

View File

@ -1100,7 +1100,7 @@ if (defined $makefiles{'gtk'}) {
"\n".
"# You can define this path to point at your tools if you need to\n".
"# TOOLPATH = /opt/gcc/bin\n".
"CC = \$(TOOLPATH)cc\n".
"CC := \$(TOOLPATH)\$(CC)\n".
"# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n".
"# (depending on what works on your system) if you want to enforce\n".
"# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n".
@ -1108,9 +1108,9 @@ if (defined $makefiles{'gtk'}) {
"# to 1.2 if it isn't found.\n".
"GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -ansi -pedantic -g " .
&splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
" `\$(GTK_CONFIG) --cflags`")."\n".
" `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
"XLDFLAGS = `\$(GTK_CONFIG) --libs`\n".
"ULDFLAGS =#\n".
"INSTALL=install\n",