From 8f6189600f4278edbbf1eabc0bf9236a50978c2d Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Sun, 15 Aug 2010 16:55:02 +0200
Subject: [PATCH] Syncroniszed vclean target; fixed some comments.

---
 lib/Makefile.Watcom  | 2 +-
 lib/Makefile.m32     | 3 +--
 lib/Makefile.netware | 6 +++---
 src/Makefile.Watcom  | 2 +-
 src/Makefile.m32     | 3 +--
 src/Makefile.netware | 6 +++---
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 9096fa91f1..46b6ec9ac2 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -128,7 +128,7 @@ clean: .SYMBOLIC
 	-$(RM) $(OBJS_DYN)
 	-$(RM) $(RESOURCE) $(LINK_ARG) $(LIB_ARG)
 
-vclean realclean: clean .SYMBOLIC
+vclean distclean: clean .SYMBOLIC
 	-$(RM) $(TARGETS) $(LIBNAME).map $(LIBNAME).sym
 	-$(RD) $(OBJ_BASE)\stat
 	-$(RD) $(OBJ_BASE)\dyn
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3bcac0ac20..2e1a934bfa 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -148,7 +148,7 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
 clean:
 	-$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
 
-distrib: clean
+distclean vclean: clean
 	-$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)
 
 FORCE: ;
@@ -156,4 +156,3 @@ FORCE: ;
 $(LIBCARES_PATH)/libcares.a:
 	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
 
-
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index a3e77b745c..1d8e1a9ef9 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -84,14 +84,14 @@ else
 	CC = gcc
 endif
 PERL	= perl
-# a native win32 awk can be downloaded from here:
+# Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk-20070501.zip
 AWK	= awk
 YACC	= bison -y
 CP	= cp -afv
 MKDIR	= mkdir
 # RM	= rm -f
-# if you want to mark the target as MTSAFE you will need a tool for
+# If you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.net/development/prgtools/mkxdc.zip
 MPKXDC	= mkxdc
@@ -269,7 +269,7 @@ clean:
 	-$(RM) curl_config.h
 	-$(RM) -r $(OBJDIR)
 
-distclean: clean
+distclean vclean: clean
 	-$(RM) $(TARGET).$(LIBEXT) $(TARGET).nlm
 	-$(RM) certdata.txt ca-bundle.crt
 
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 5391fbe8bb..2cb805d06a 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -113,7 +113,7 @@ clean: .SYMBOLIC
 	-$(RM) $(OBJS)
 	-$(RM) $(RESOURCE) $(LINK_ARG)
 
-vclean realclean: clean .SYMBOLIC
+vclean distclean: clean .SYMBOLIC
 	-$(RD) $(OBJ_DIR)
 	-$(RM) curl.exe curl.map curl.sym hugehelp.c
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 6894942582..48eaf3bd3f 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -159,7 +159,6 @@ ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
 endif
 	-$(RM) $(curl_OBJECTS) $(RESOURCE)
 
-distrib: clean
+distclean vclean: clean
 	-$(RM) $(curl_PROGRAMS)
 
-
diff --git a/src/Makefile.netware b/src/Makefile.netware
index a498986062..4552c2741f 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -85,13 +85,13 @@ else
 	CC = gcc
 endif
 PERL	= perl
-# a native win32 awk can be downloaded from here:
+# Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk-20070501.zip
 AWK	= awk
 CP	= cp -afv
 MKDIR	= mkdir
 # RM	= rm -f
-# if you want to mark the target as MTSAFE you will need a tool for
+# If you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.net/development/prgtools/mkxdc.zip
 MPKXDC	= mkxdc
@@ -263,7 +263,7 @@ endif
 	-$(RM) curl_config.h
 	-$(RM) -r $(OBJDIR)
 
-distclean: clean
+distclean vclean: clean
 	-$(RM) $(TARGET).nlm
 
 $(OBJDIR) $(INSTDIR):
-- 
GitLab