#
# FIXME: no attempt made to handle !forceobj in the project files.
+use warnings;
use FileHandle;
use Cwd;
%groups = (); # maps group name to listref of objects/resources
while (<IN>) {
- # Skip comments (unless the comments belong, for example because
- # they're part of a diversion).
- next if /^\s*#/ and !defined $divert;
-
chomp;
- split;
+ @_ = split;
+
+ # If we're gathering help text, keep doing so.
+ if (defined $divert) {
+ if ((defined $_[0]) && $_[0] eq "!end") {
+ $divert = undef;
+ } else {
+ ${$divert} .= "$_\n";
+ }
+ next;
+ }
+ # Skip comments and blank lines.
+ next if /^\s*#/ or scalar @_ == 0;
+
if ($_[0] eq "!begin" and $_[1] eq "help") { $divert = \$help; next; }
if ($_[0] eq "!end") { $divert = undef; next; }
if ($_[0] eq "!name") { $project_name = $_[1]; next; }
$sect = $_[2] ? $_[2] : "end";
$divert = \($makefile_extra{$_[1]}->{$sect});
} else {
+ $dummy = '';
$divert = \$dummy;
}
next;
foreach $i (@prognames) {
($prog, $type) = split ",", $i;
# Strip duplicate object names.
- $prev = undef;
+ $prev = '';
@list = grep { $status = ($prev ne $_); $prev=$_; $status }
sort @{$programs{$i}};
$programs{$i} = [@list];
while (scalar @scanlist > 0) {
$file = shift @scanlist;
next if defined $further{$file}; # skip if we've already done it
- $resource = ($file =~ /\.rc$/ ? 1 : 0);
$further{$file} = [];
$dirfile = &findfile($file);
open IN, "$dirfile" or die "unable to open source file $file\n";
while (scalar @scanlist > 0) {
$file = shift @scanlist;
foreach $j (@{$further{$file}}) {
- if ($dep{$j} != 1) {
+ if (!$dep{$j}) {
$dep{$j} = 1;
push @{$depends{$i}}, $j;
push @scanlist, $j;
# Returns true if the argument is a known makefile type. Otherwise,
# prints a warning and returns false;
if (grep { $type eq $_ }
- ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","ac","mpw",
- "osx",)) {
+ ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix",
+ "ac","mpw","osx",)) {
return 1;
}
warn "$.:unknown makefile type '$type'\n";
# Utility routines while writing out the Makefiles.
+sub def {
+ my ($x) = shift @_;
+ return (defined $x) ? $x : "";
+}
+
sub dirpfx {
my ($path) = shift @_;
my ($sep) = shift @_;
- my $ret = "", $i;
+ my $ret = "";
+ my $i;
while (($i = index $path, $sep) >= 0 ||
($j = index $path, "/") >= 0) {
sub findfile {
my ($name) = @_;
- my $dir;
+ my $dir = '';
my $i;
my $outdir = undef;
unless (defined $findfilecache{$name}) {
$i = 0;
foreach $dir (@srcdirs) {
- $outdir = $dir, $i++ if -f "$dir$name";
- $outdir=~s/^\.\///;
+ if (-f "$dir$name") {
+ $outdir = $dir;
+ $i++;
+ $outdir =~ s/^\.\///;
+ }
}
die "multiple instances of source file $name\n" if $i > 1;
$findfilecache{$name} = (defined $outdir ? $outdir . $name : undef);
my ($prog, $otmpl, $rtmpl, $ltmpl, $prefix, $dirsep) = @_;
my @ret;
my ($i, $x, $y);
+ ($otmpl, $rtmpl, $ltmpl) = map { defined $_ ? $_ : "" } ($otmpl, $rtmpl, $ltmpl);
@ret = ();
foreach $i (@{$programs{$prog}}) {
$x = "";
my ($prog, $suffix) = @_;
my @ret;
my ($i, $x, $y);
+ ($otmpl, $rtmpl, $ltmpl) = map { defined $_ ? $_ : "" } ($otmpl, $rtmpl, $ltmpl);
@ret = ();
foreach $i (@{$programs{$prog}}) {
if (substr($i, (length $i) - (length $suffix)) eq $suffix) {
sub splitline {
my ($line, $width, $splitchar) = @_;
- my ($result, $len);
+ my $result = "";
+ my $len;
$len = (defined $width ? $width : 76);
$splitchar = (defined $splitchar ? $splitchar : '\\');
while (length $line > $len) {
sub deps {
my ($otmpl, $rtmpl, $prefix, $dirsep, $mftyp, $depchar, $splitchar) = @_;
my ($i, $x, $y);
- my @deps, @ret;
+ my @deps;
+ my @ret;
@ret = ();
$depchar ||= ':';
foreach $i (sort keys %depends) {
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"\n".
"# RCINC = --include-dir c:\\cygwin\\include\\\n".
"\n".
&splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
- " -D_NO_OLDNAMES -DNO_MULTIMON " .
+ " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " .
(join " ", map {"-I$dirpfx$_"} @srcdirs)) .
"\n".
"LDFLAGS = -mno-cygwin -s\n".
if ($d->{obj} =~ /\.res\.o$/) {
print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
} else {
- print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n";
+ print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n";
}
}
print "\n";
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# bcc32 command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"\n".
"MAKEFILE = Makefile.bor\n".
"\n".
"# C compilation flags\n".
- "CFLAGS = -D_WINDOWS -DWINVER=0x0401\n".
+ "CFLAGS = -D_WINDOWS -DWINVER=0x0500\n".
"# Resource compilation flags\n".
"RCFLAGS = -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401\n".
"\n".
"\n".
".c.obj:\n".
&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
- " \$(XFLAGS) \$(CFLAGS) ".
+ " \$(CFLAGS) \$(XFLAGS) ".
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
" /c \$*.c",69)."\n".
".rc.res:\n".
print "\n\n";
foreach $p (&prognames("G:C")) {
($prog, $type) = split ",", $p;
- $objstr = &objects($p, "X.obj", "X.res", undef);
+ $objstr = &objects($p, "X.obj", "X.res", undef);
print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
my $ap = ($type eq "G") ? "-aa" : "-ap";
print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$prog.rsp\n\n";
"# C compilation flags\n".
"CFLAGS = /nologo /W3 /O1 " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
- " /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401\n".
+ " /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500\n".
"LFLAGS = /incremental:no /fixed\n".
"RCFLAGS = -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
"\n".
print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @$extradeps, @{$d->{deps}})), "\n";
if ($d->{obj} =~ /.obj$/) {
- print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n";
+ print "\tcl \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c ".$d->{deps}->[0],"\n\n";
} else {
print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n";
}
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"\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".
+ "# If necessary set the path to krb5-config here\n".
+ "KRB5CONFIG=krb5-config\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 x11'\n".
+ "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n".
+ "# to 1.2 if it isn't found.\n".
+ "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 x11 \$\$0 2>/dev/null || gtk-config \$\$0'\n".
+ "\n".
+ "-include Makefile.local\n".
+ "\n".
+ "unexport CFLAGS # work around a weird issue with krb5-config\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
- " `gtk-config --cflags`").
+ " \$(shell \$(GTK_CONFIG) --cflags)").
" -D _FILE_OFFSET_BITS=64\n".
- "XLDFLAGS = `gtk-config --libs`\n".
- "ULDFLAGS =#\n".
- "INSTALL=install\n",
- "INSTALL_PROGRAM=\$(INSTALL)\n",
- "INSTALL_DATA=\$(INSTALL)\n",
- "prefix=/usr/local\n",
- "exec_prefix=\$(prefix)\n",
- "bindir=\$(exec_prefix)/bin\n",
- "mandir=\$(prefix)/man\n",
- "man1dir=\$(mandir)/man1\n",
+ "XLDFLAGS = \$(LDFLAGS) \$(shell \$(GTK_CONFIG) --libs)\n".
+ "ULDFLAGS = \$(LDFLAGS)\n".
+ "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n".
+ "ifeq (,\$(findstring STATIC_GSSAPI,\$(COMPAT)))\n".
+ "XLDFLAGS+= -ldl\n".
+ "ULDFLAGS+= -ldl\n".
+ "else\n".
+ "CFLAGS+= -DNO_LIBDL \$(shell \$(KRB5CONFIG) --cflags gssapi)\n".
+ "XLDFLAGS+= \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+ "ULDFLAGS+= \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+ "endif\n".
+ "endif\n".
+ "INSTALL=install\n".
+ "INSTALL_PROGRAM=\$(INSTALL)\n".
+ "INSTALL_DATA=\$(INSTALL)\n".
+ "prefix=/usr/local\n".
+ "exec_prefix=\$(prefix)\n".
+ "bindir=\$(exec_prefix)/bin\n".
+ "mandir=\$(prefix)/man\n".
+ "man1dir=\$(mandir)/man1\n".
"\n".
- $makefile_extra{'gtk'}->{'vars'} .
+ &def($makefile_extra{'gtk'}->{'vars'}) .
"\n".
".SUFFIXES:\n".
"\n".
$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) -o \$@ " .
+ $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
}
foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
if ($forceobj{$d->{obj_orig}}) {
print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @{$d->{deps}})), "\n";
}
- print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
+ print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
}
print "\n";
print $makefile_extra{'gtk'}->{'end'};
select STDOUT; close OUT;
}
+if (defined $makefiles{'unix'}) {
+ $dirpfx = &dirpfx($makefiles{'unix'}, "/");
+
+ ##-- GTK-free pure-Unix makefile for non-GUI apps only
+ open OUT, ">$makefiles{'unix'}"; select OUT;
+ print
+ "# Makefile for $project_name under Unix.\n".
+ "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
+ "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
+ # gcc command line option is -D not /D
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
+ print $_;
+ print
+ "\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".
+ "\n".
+ "-include Makefile.local\n".
+ "\n".
+ "unexport CFLAGS # work around a weird issue with krb5-config\n".
+ "\n".
+ &splitline("CFLAGS = -O2 -Wall -Werror -g " .
+ (join " ", map {"-I$dirpfx$_"} @srcdirs)).
+ " -D _FILE_OFFSET_BITS=64\n".
+ "ULDFLAGS = \$(LDFLAGS)\n".
+ "INSTALL=install\n".
+ "INSTALL_PROGRAM=\$(INSTALL)\n".
+ "INSTALL_DATA=\$(INSTALL)\n".
+ "prefix=/usr/local\n".
+ "exec_prefix=\$(prefix)\n".
+ "bindir=\$(exec_prefix)/bin\n".
+ "mandir=\$(prefix)/man\n".
+ "man1dir=\$(mandir)/man1\n".
+ "\n".
+ &def($makefile_extra{'unix'}->{'vars'}) .
+ "\n".
+ ".SUFFIXES:\n".
+ "\n".
+ "\n";
+ print &splitline("all:" . join "", map { " $_" } &progrealnames("U"));
+ print "\n\n";
+ foreach $p (&prognames("U")) {
+ ($prog, $type) = split ",", $p;
+ $objstr = &objects($p, "X.o", undef, undef);
+ print &splitline($prog . ": " . $objstr), "\n";
+ $libstr = &objects($p, undef, undef, "-lX");
+ print &splitline("\t\$(CC) -o \$@ " .
+ $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
+ }
+ foreach $d (&deps("X.o", undef, $dirpfx, "/", "unix")) {
+ if ($forceobj{$d->{obj_orig}}) {
+ printf("%s: FORCE\n", $d->{obj});
+ } else {
+ print &splitline(sprintf("%s: %s", $d->{obj},
+ join " ", @{$d->{deps}})), "\n";
+ }
+ print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
+ }
+ print "\n";
+ print &def($makefile_extra{'unix'}->{'end'});
+ print "\nclean:\n".
+ "\trm -f *.o". (join "", map { " $_" } &progrealnames("U")) . "\n";
+ print "\nFORCE:\n";
+ select STDOUT; close OUT;
+}
+
if (defined $makefiles{'ac'}) {
$dirpfx = &dirpfx($makefiles{'ac'}, "/");
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"\n".
"CC = \@CC\@\n".
"\n".
- &splitline("CFLAGS = \@CFLAGS\@ \@CPPFLAGS\@ \@DEFS\@ \@GTK_CFLAGS\@ " .
+ &splitline("CFLAGS = \@CFLAGS\@ \@PUTTYCFLAGS\@ \@CPPFLAGS\@ " .
+ "\@DEFS\@ \@GTK_CFLAGS\@ " .
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
"XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
"ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
- "INSTALL=\@INSTALL\@\n",
- "INSTALL_PROGRAM=\$(INSTALL)\n",
- "INSTALL_DATA=\$(INSTALL)\n",
- "prefix=\@prefix\@\n",
- "exec_prefix=\@exec_prefix\@\n",
- "bindir=\@bindir\@\n",
- "mandir=\@mandir\@\n",
- "man1dir=\$(mandir)/man1\n",
+ "INSTALL=\@INSTALL\@\n".
+ "INSTALL_PROGRAM=\$(INSTALL)\n".
+ "INSTALL_DATA=\$(INSTALL)\n".
+ "prefix=\@prefix\@\n".
+ "exec_prefix=\@exec_prefix\@\n".
+ "bindir=\@bindir\@\n".
+ "datarootdir=\@datarootdir\@\n".
+ "mandir=\@mandir\@\n".
+ "man1dir=\$(mandir)/man1\n".
"\n".
- $makefile_extra{'gtk'}->{'vars'} .
+ &def($makefile_extra{'gtk'}->{'vars'}) .
"\n".
".SUFFIXES:\n".
"\n".
$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) -o \$@ " .
+ $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n";
}
foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
if ($forceobj{$d->{obj_orig}}) {
print &splitline(sprintf("%s: %s", $d->{obj},
join " ", @{$d->{deps}})), "\n";
}
- print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
+ print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
}
print "\n";
print $makefile_extra{'gtk'}->{'end'};
print "\nclean:\n".
"\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
+ print "\ndistclean: clean\n".
+ "\t". &splitline("rm -f config.status config.cache config.log ".
+ "configure.lineno config.status.lineno Makefile") . "\n";
print "\nFORCE:\n";
select STDOUT; close OUT;
}
"# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# MPW command line option is -d not /D (FIXME further massaging?)
- ($_ = $help) =~ s/([=" ])\/D/\1-d /gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-d /gs;
print $_;
print "\n\n".
"ROptions = `Echo \"{VER}\" | StreamEdit -e \"1,\$ replace /=(\xc5)\xa81\xb0/ 'STR=\xb6\xb6\xb6\xb6\xb6\"' \xa81 '\xb6\xb6\xb6\xb6\xb6\"'\"`".
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# lcc command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"\n".
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.obj", "X.res", undef);
print &splitline("$prog.exe: " . $objstr ), "\n";
- $subsystemtype = undef;
+ $subsystemtype = '';
if ($type eq "G") { $subsystemtype = "-subsystem windows"; }
my $libss = "shell32.lib wsock32.lib ws2_32.lib winspool.lib winmm.lib imm32.lib";
print &splitline("\tlcclnk $subsystemtype -o $prog.exe $objstr $libss");
}
if ($d->{obj} =~ /\.obj$/) {
print &splitline("\tlcc -O -p6 \$(COMPAT)".
- " \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n";
+ " \$(CFLAGS) \$(XFLAGS) ".$d->{deps}->[0],69)."\n";
} else {
print &splitline("\tlrc \$(RCFL) -r \$(RCFLAGS) ".
$d->{deps}->[0],69)."\n";
"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
# gcc command line option is -D not /D
- ($_ = $help) =~ s/([=" ])\/D/\1-D/gs;
+ ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
print $_;
print
"CC = \$(TOOLPATH)gcc\n".
print &splitline("${prog}.app/Contents/MacOS/$prog: ".
"${prog}.app/Contents/MacOS " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX");
- print &splitline("\t\$(CC)" . $mw . " \$(MLDFLAGS) -o \$@ " .
+ print &splitline("\t\$(CC) \$(MLDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n";
}
foreach $p (&prognames("U")) {
$objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX");
- print &splitline("\t\$(CC)" . $mw . " \$(ULDFLAGS) -o \$@ " .
+ print &splitline("\t\$(CC) \$(ULDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n";
}
- foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
+ foreach $d (&deps("X.o", undef, $dirpfx, "/", "osx")) {
if ($forceobj{$d->{obj_orig}}) {
printf("%s: FORCE\n", $d->{obj});
} else {
}
$firstdep = $d->{deps}->[0];
if ($firstdep =~ /\.c$/) {
- print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n";
+ print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
} elsif ($firstdep =~ /\.m$/) {
- print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n";
+ print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n";
}
}
- print "\n".$makefile_extra{'osx'}->{'end'};
+ print "\n".&def($makefile_extra{'osx'}->{'end'});
print "\nclean:\n".
"\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n".
- "\trm -rf *.app\n";
+ "\trm -rf *.app\n".
"\n".
"FORCE:\n";
select STDOUT; close OUT;