From d8284c29049a1fec0f1de0d74d698fe4357f3825 Mon Sep 17 00:00:00 2001
From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 15 Jan 2005 18:30:05 +0000
Subject: [PATCH] FWHACK has been dead for years.  Remove it from the
 Makefiles.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5113 cda61777-01e9-0310-a592-d414129be87e
---
 Recipe     | 15 ++++++---------
 mkfiles.pl | 18 +++++++++---------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Recipe b/Recipe
index 8f1ae447..cac68f1e 100644
--- a/Recipe
+++ b/Recipe
@@ -32,9 +32,6 @@
 #
 # Extra options you can set:
 #
-#  - FWHACK=/DFWHACK
-#      Enables a hack that tunnels through some firewall proxies.
-#
 #  - VER=/DSNAPSHOT=1999-01-25
 #      Generates executables whose About box report them as being a
 #      development snapshot.
@@ -115,25 +112,25 @@
 # Hack to force version.o to be rebuilt always.
 !begin vc
 version.obj: *.c *.h *.rc
-	cl $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
+	cl $(VER) $(CFLAGS) /c ..\version.c
 !end
 !specialobj vc version
 !begin cygwin
 version.o: FORCE
 FORCE:
-	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
+	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
 !end
 !specialobj cygwin version
 !begin borland
 version.obj: FORCE
 FORCE:
-	bcc32 $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
+	bcc32 $(VER) $(CFLAGS) /c ..\version.c
 !end
 !specialobj borland version
 !begin lcc
 version.o: FORCE
 FORCE:
-	lcc $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c
+	lcc $(VER) $(CFLAGS) /c ..\version.c
 !end
 !specialobj lcc version
 # For Unix, we also need the gross MD5 hack that causes automatic
@@ -142,9 +139,9 @@ FORCE:
 version.o: FORCE;
 FORCE:
 	if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
 	else \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
 	fi
 !end
 !specialobj gtk version
diff --git a/mkfiles.pl b/mkfiles.pl
index d595e535..1860b5f4 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -398,9 +398,9 @@ if (defined $makefiles{'cygwin'}) {
       print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
         "\n";
       if ($d->{obj} =~ /\.res\.o$/) {
-	  print "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
+	  print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n";
       } else {
-	  print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n";
+	  print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n";
       }
     }
     print "\n";
@@ -451,12 +451,12 @@ if (defined $makefiles{'borland'}) {
     "!endif\n".
     "\n".
     ".c.obj:\n".
-    &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT) \$(FWHACK)".
+    &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
 	       " \$(XFLAGS) \$(CFLAGS) ".
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
 	       " /c \$*.c",69)."\n".
     ".rc.res:\n".
-    &splitline("\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include -r".
+    &splitline("\tbrcc32 \$(RCFL) -i \$(BCB)\\include -r".
       " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n".
     "\n";
     print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
@@ -570,9 +570,9 @@ if (defined $makefiles{'vc'}) {
 	print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
 	  "\n";
         if ($d->{obj} =~ /.obj$/) {
-	    print "\tcl \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n";
+	    print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n";
 	} else {
-	    print "\trc \$(FWHACK) \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 ".$d->{deps}->[0],"\n\n";
+	    print "\trc \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 ".$d->{deps}->[0],"\n\n";
 	}
     }
     print "\n";
@@ -910,7 +910,7 @@ if (defined $makefiles{'gtk'}) {
     foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) {
       print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
           "\n";
-      print &splitline("\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
+      print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n");
     }
     print "\n";
     print $makefile_extra{'gtk'};
@@ -1101,10 +1101,10 @@ if (defined $makefiles{'lcc'}) {
       print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
         "\n";
       if ($d->{obj} =~ /\.obj$/) {
-	  print &splitline("\tlcc -O -p6 \$(COMPAT) \$(FWHACK)".
+	  print &splitline("\tlcc -O -p6 \$(COMPAT)".
 			   " \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n";
       } else {
-	  print &splitline("\tlrc \$(FWHACK) \$(RCFL) -r ".$d->{deps}->[0],69)."\n";
+	  print &splitline("\tlrc \$(RCFL) -r ".$d->{deps}->[0],69)."\n";
       }
     }
     print "\n";
-- 
2.11.0