#
# 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","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".
"#\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".
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";
"#\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}}) {
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 $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;
}
-if (defined $makefiles{'mpw'}) {
- ##-- MPW Makefile
- open OUT, ">$makefiles{'mpw'}"; select OUT;
- print
- "# Makefile for $project_name under MPW.\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";
- # MPW command line option is -d not /D (FIXME further massaging?)
- ($_ = $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".
- "C_68K = {C}\n".
- "C_CFM68K = {C}\n".
- "C_PPC = {PPCC}\n".
- "C_Carbon = {PPCC}\n".
- "\n".
- "# -w 35 disables \"unused parameter\" warnings\n".
- "COptions = -i : -i :: -i ::charset -w 35 -w err -proto strict -ansi on \xb6\n".
- " -notOnce\n".
- "COptions_68K = {COptions} -model far -opt time\n".
- "# Enabling \"-opt space\" for CFM-68K gives me undefined references to\n".
- "# _\$LDIVT and _\$LMODT.\n".
- "COptions_CFM68K = {COptions} -model cfmSeg -opt time\n".
- "COptions_PPC = {COptions} -opt size -traceback\n".
- "COptions_Carbon = {COptions} -opt size -traceback -d TARGET_API_MAC_CARBON\n".
- "\n".
- "Link_68K = ILink\n".
- "Link_CFM68K = ILink\n".
- "Link_PPC = PPCLink\n".
- "Link_Carbon = PPCLink\n".
- "\n".
- "LinkOptions = -c 'pTTY'\n".
- "LinkOptions_68K = {LinkOptions} -br 68k -model far -compact\n".
- "LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact\n".
- "LinkOptions_PPC = {LinkOptions}\n".
- "LinkOptions_Carbon = -m __appstart -w {LinkOptions}\n".
- "\n".
- "Libs_68K = \"{CLibraries}StdCLib.far.o\" \xb6\n".
- " \"{Libraries}MacRuntime.o\" \xb6\n".
- " \"{Libraries}MathLib.far.o\" \xb6\n".
- " \"{Libraries}IntEnv.far.o\" \xb6\n".
- " \"{Libraries}Interface.o\" \xb6\n".
- " \"{Libraries}Navigation.far.o\" \xb6\n".
- " \"{Libraries}OpenTransport.o\" \xb6\n".
- " \"{Libraries}OpenTransportApp.o\" \xb6\n".
- " \"{Libraries}OpenTptInet.o\" \xb6\n".
- " \"{Libraries}UnicodeConverterLib.far.o\"\n".
- "\n".
- "Libs_CFM = \"{SharedLibraries}InterfaceLib\" \xb6\n".
- " \"{SharedLibraries}StdCLib\" \xb6\n".
- " \"{SharedLibraries}AppearanceLib\" \xb6\n".
- " -weaklib AppearanceLib \xb6\n".
- " \"{SharedLibraries}NavigationLib\" \xb6\n".
- " -weaklib NavigationLib \xb6\n".
- " \"{SharedLibraries}TextCommon\" \xb6\n".
- " -weaklib TextCommon \xb6\n".
- " \"{SharedLibraries}UnicodeConverter\" \xb6\n".
- " -weaklib UnicodeConverter\n".
- "\n".
- "Libs_CFM68K = {Libs_CFM} \xb6\n".
- " \"{CFM68KLibraries}NuMacRuntime.o\"\n".
- "\n".
- "Libs_PPC = {Libs_CFM} \xb6\n".
- " \"{SharedLibraries}ControlsLib\" \xb6\n".
- " -weaklib ControlsLib \xb6\n".
- " \"{SharedLibraries}WindowsLib\" \xb6\n".
- " -weaklib WindowsLib \xb6\n".
- " \"{SharedLibraries}OpenTransportLib\" \xb6\n".
- " -weaklib OTClientLib \xb6\n".
- " -weaklib OTClientUtilLib \xb6\n".
- " \"{SharedLibraries}OpenTptInternetLib\" \xb6\n".
- " -weaklib OTInetClientLib \xb6\n".
- " \"{PPCLibraries}StdCRuntime.o\" \xb6\n".
- " \"{PPCLibraries}PPCCRuntime.o\" \xb6\n".
- " \"{PPCLibraries}CarbonAccessors.o\" \xb6\n".
- " \"{PPCLibraries}OpenTransportAppPPC.o\" \xb6\n".
- " \"{PPCLibraries}OpenTptInetPPC.o\"\n".
- "\n".
- "Libs_Carbon = \"{PPCLibraries}CarbonStdCLib.o\" \xb6\n".
- " \"{PPCLibraries}StdCRuntime.o\" \xb6\n".
- " \"{PPCLibraries}PPCCRuntime.o\" \xb6\n".
- " \"{SharedLibraries}CarbonLib\" \xb6\n".
- " \"{SharedLibraries}StdCLib\"\n".
- "\n";
- print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
- print "\n\n";
- foreach $p (&prognames("M")) {
- ($prog, $type) = split ",", $p;
-
- print &splitline("$prog \xc4 $prog.68k $prog.ppc $prog.carbon",
- undef, "\xb6"), "\n\n";
-
- $rsrc = &objects($p, "", "X.rsrc", undef);
-
- foreach $arch (qw(68K CFM68K PPC Carbon)) {
- $objstr = &objects($p, "X.\L$arch\E.o", "", undef);
- print &splitline("$prog.\L$arch\E \xc4 $objstr $rsrc", undef, "\xb6");
- print "\n";
- print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
- print &splitline("\t{Link_$arch} -o {Targ} -fragname $prog " .
- "{LinkOptions_$arch} " .
- $objstr . " {Libs_$arch}", 69, "\xb6"), "\n";
- print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
- }
-
- }
- foreach $d (&deps("", "X.rsrc", "::", ":", "mpw")) {
- next unless $d->{obj};
- print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}),
- undef, "\xb6"), "\n";
- print "\tRez ", $d->{deps}->[0], " -o {Targ} {ROptions}\n\n";
- }
- foreach $arch (qw(68K CFM68K)) {
- foreach $d (&deps("X.\L$arch\E.o", "", "::", ":", "mpw")) {
- next unless $d->{obj};
- print &splitline(sprintf("%s \xc4 %s", $d->{obj},
- join " ", @{$d->{deps}}),
- undef, "\xb6"), "\n";
- print "\t{C_$arch} ", $d->{deps}->[0],
- " -o {Targ} {COptions_$arch}\n\n";
- }
- }
- foreach $arch (qw(PPC Carbon)) {
- foreach $d (&deps("X.\L$arch\E.o", "", "::", ":", "mpw")) {
- next unless $d->{obj};
- print &splitline(sprintf("%s \xc4 %s", $d->{obj},
- join " ", @{$d->{deps}}),
- undef, "\xb6"), "\n";
- # The odd stuff here seems to stop afpd getting confused.
- print "\techo -n > {Targ}\n";
- print "\tsetfile -t XCOF {Targ}\n";
- print "\t{C_$arch} ", $d->{deps}->[0],
- " -o {Targ} {COptions_$arch}\n\n";
- }
- }
- select STDOUT; close OUT;
-}
-
if (defined $makefiles{'lcc'}) {
$dirpfx = &dirpfx($makefiles{'lcc'}, "\\");
"#\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");
"#\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 {
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;
projects / u / mdw / putty / blobdiff