Clean up Carbon build procedures somewhat. I still don't have anything that

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 384a88e..626141b 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -539,7 +539,7 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
+&splitline("CFLAGS = -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
 "XLDFLAGS = `gtk-config --libs`\n".
 "ULDFLAGS =#\n".
 "INSTALL=install\n",
@@ -604,29 +604,38 @@ print <<END;
 ROptions     = `Echo "{VER}" | StreamEdit -e "1,\$ replace /=(\xc5)\xa81\xb0/ 'STR=\xb6\xb6\xb6\xb6\xb6"' \xa81 '\xb6\xb6\xb6\xb6\xb6"'"`
 
 # -w 35 disables "unused parameter" warnings
-COptions     = -i : -i :: -w 35 -w err -proto strict
-COptions_68K = {COptions} -model far -opt space
+COptions     = -i : -i :: -i ::charset -w 35 -w err -proto strict -ansi on \xb6
+              -notOnce
+COptions_68K = {COptions} -model far -opt time
 # Enabling "-opt space" for CFM-68K gives me undefined references to
 # _$LDIVT and _$LMODT.
 COptions_CFM68K = {COptions} -model cfmSeg -opt time
 COptions_PPC = {COptions} -opt size
+COptions_Carbon = {COptions} -opt size -d TARGET_API_MAC_CARBON
 
 LinkOptions = -c 'pTTY' -fragname PuTTY
 LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
 LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
 LinkOptions_PPC = {LinkOptions}
+LinkOptions_Carbon = -m __appstart -w {LinkOptions}
 
 Libs_68K =     "{CLibraries}StdCLib.far.o" \xb6
                "{Libraries}MacRuntime.o" \xb6
                "{Libraries}MathLib.far.o" \xb6
                "{Libraries}IntEnv.far.o" \xb6
                "{Libraries}Interface.o" \xb6
+               "{Libraries}Navigation.far.o" \xb6
+               "{Libraries}OpenTransport.o" \xb6
+               "{Libraries}OpenTransportApp.o" \xb6
+               "{Libraries}OpenTptInet.o" \xb6
                "{Libraries}UnicodeConverterLib.far.o"
 
 Libs_CFM =     "{SharedLibraries}InterfaceLib" \xb6
                "{SharedLibraries}StdCLib" \xb6
                "{SharedLibraries}AppearanceLib" \xb6
                        -weaklib AppearanceLib \xb6
+               "{SharedLibraries}NavigationLib" \xb6
+                       -weaklib NavigationLib \xb6
                "{SharedLibraries}TextCommon" \xb6
                        -weaklib TextCommon \xb6
                "{SharedLibraries}UnicodeConverter" \xb6
@@ -636,9 +645,26 @@ Libs_CFM68K =      {Libs_CFM} \xb6
                "{CFM68KLibraries}NuMacRuntime.o"
 
 Libs_PPC =     {Libs_CFM} \xb6
+               "{SharedLibraries}ControlsLib" \xb6
+                       -weaklib ControlsLib \xb6
+               "{SharedLibraries}WindowsLib" \xb6
+                       -weaklib WindowsLib \xb6
+               "{SharedLibraries}OpenTransportLib" \xb6
+                       -weaklib OTClientLib \xb6
+                       -weaklib OTClientUtilLib \xb6
+               "{SharedLibraries}OpenTptInternetLib" \xb6
+                       -weaklib OTInetClientLib \xb6
                "{PPCLibraries}StdCRuntime.o" \xb6
                "{PPCLibraries}PPCCRuntime.o" \xb6
-               "{PPCLibraries}CarbonAccessors.o"
+               "{PPCLibraries}CarbonAccessors.o" \xb6
+               "{PPCLibraries}OpenTransportAppPPC.o" \xb6
+               "{PPCLibraries}OpenTptInetPPC.o"
+
+Libs_Carbon =  "{PPCLibraries}CarbonStdCLib.o" \xb6
+               "{PPCLibraries}StdCRuntime.o" \xb6
+               "{PPCLibraries}PPCCRuntime.o" \xb6
+               "{SharedLibraries}CarbonLib" \xb6
+               "{SharedLibraries}StdCLib"
 
 END
 print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
@@ -646,7 +672,7 @@ print "\n\n";
 foreach $p (&prognames("M")) {
   ($prog, $type) = split ",", $p;
 
-  print &splitline("$prog \xc4 $prog.68k $prog.cfm68k $prog.ppc",
+  print &splitline("$prog \xc4 $prog.68k $prog.ppc",
                   undef, "\xb6"), "\n\n";
 
   $rsrc = &objects($p, "", "X.rsrc", undef);
@@ -656,21 +682,28 @@ foreach $p (&prognames("M")) {
   print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
   print &splitline("\tILink -o {Targ} {LinkOptions_68K} " .
                    $objstr . " {Libs_68K}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
+  print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
 
   $objstr = &objects($p, "X.cfm68k.o", "", undef);
   print &splitline("$prog.cfm68k \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
   print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
   print &splitline("\tILink -o {Targ} {LinkOptions_CFM68K} " .
                    $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
+  print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
 
   $objstr = &objects($p, "X.ppc.o", "", undef);
   print &splitline("$prog.ppc \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
   print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
   print &splitline("\tPPCLink -o {Targ} {LinkOptions_PPC} " .
                    $objstr . " {Libs_PPC}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
+  print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
+
+  $objstr = &objects($p, "X.carbon.o", "", undef);
+  print &splitline("$prog.carbon \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
+  print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
+  print &splitline("\tPPCLink -o {Targ} {LinkOptions_Carbon} " .
+                   $objstr . " {Libs_Carbon}", 69, "\xb6"), "\n";
+  print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
 }
 foreach $d (&deps("", "X.rsrc", "::", ":")) {
   next unless $d->{obj};
@@ -699,4 +732,13 @@ foreach $d (&deps("X.ppc.o", "", "::", ":")) {
   print "\tsetfile -t XCOF {Targ}\n";
   print "\t{PPCC} ", $d->{deps}->[0], " -o {Targ} {COptions_PPC}\n\n";
 }
+foreach $d (&deps("X.carbon.o", "", "::", ":")) {
+  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{PPCC} ", $d->{deps}->[0], " -o {Targ} {COptions_Carbon}\n\n";
+}
 select STDOUT; close OUT;