Oops: r9004 should have removed various pieces from the Makefile and

header file setup too.

git-svn-id: svn://svn.tartarus.org/sgt/putty@9005 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Recipe b/Recipe
index 3c4b6e3..48e304c 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -20,14 +20,12 @@
 !makefile gtk unix/Makefile.gtk
 !makefile unix unix/Makefile.ux
 !makefile ac unix/Makefile.in
-!makefile mpw mac/Makefile.mpw
 !makefile osx macosx/Makefile
 !makefile devcppproj windows/DEVCPP
 # Source directories.
 !srcdir charset/
 !srcdir windows/
 !srcdir unix/
-!srcdir mac/
 !srcdir macosx/
 
 # Help text added to the top of each Makefile, with /D converted
@@ -268,7 +266,6 @@ SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshgssc pgssapi
 WINSSH   = SSH winnoise winpgntc wingss
 UXSSH    = SSH uxnoise uxagentc uxgss
-MACSSH   = SSH macnoise sshnogss
 
 # SFTP implementation (pscp, psftp).
 SFTP     = sftp int64 logging
@@ -280,7 +277,6 @@ WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
          + wintime
 UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
 OSXMISC  = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time
-MACMISC  = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy
 
 # Character set library, for use in pterm.
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
@@ -306,7 +302,7 @@ U_BE_NOSSH = be_nos_s uxser nocproxy
 # Definitions of actual programs. The program name, followed by a
 # colon, followed by a list of objects. Also in the list may be the
 # keywords [G] for Windows GUI app, [C] for Console app, [X] for
-# X/GTK Unix app, [U] for command-line Unix app, [M] for Macintosh app.
+# X/GTK Unix app, [U] for command-line Unix app.
 
 putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res LIBS
 puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res nogss LIBS
@@ -347,15 +343,5 @@ puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
 pscp     : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 
-PuTTY    : [M] terminal wcwidth ldiscucs logging BE_ALL mac macdlg macevlog
-         + macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET
-         + stricmp vsnprint dialog config macctrls minibidi
-PuTTYtel : [M] terminal wcwidth ldiscucs logging BE_NOSSH mac macdlg
-        + macevlog macterm macucs mac_res.rsrc testback NONSSH MACMISC
-        + CHARSET stricmp vsnprint dialog config macctrls minibidi nogss
-PuTTYgen : [M] macpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
-         + sshrand macnoise sshsha macstore misc sshrsa sshdss macmisc sshpubk
-         + sshaes sshsh256 sshsh512 import macpgen.rsrc macpgkey macabout
-
 PuTTY    : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH
          + ux_x11 uxpty uxsignal testback putty.icns info.plist

diff --git a/mkfiles.pl b/mkfiles.pl
index 0a535a3..46befd8 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -226,7 +226,7 @@ sub mfval($) {
     # prints a warning and returns false;
     if (grep { $type eq $_ }
        ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix",
-        "ac","mpw","osx",)) {
+        "ac","osx",)) {
            return 1;
        }
     warn "$.:unknown makefile type '$type'\n";
@@ -1152,146 +1152,6 @@ if (defined $makefiles{'ac'}) {
     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'}, "\\");
 

diff --git a/puttyps.h b/puttyps.h
index d1f3c37..724bf9b 100644 (file)
--- a/puttyps.h
+++ b/puttyps.h
@@ -9,10 +9,6 @@
 
 #include "winstuff.h"
 
-#elif defined(macintosh)
-
-#include "macstuff.h"
-
 #elif defined(MACOSX)
 
 #include "osx.h"