From ea3f63281c00d1a0826f238cdb26ce775f90f35d Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Tue, 29 Jan 2008 23:46:41 +0000
Subject: [PATCH] silent stupid 'del' message when no files to delete found;
 added curl.res to clean target.

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

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index bae8edbf2d..d8131c7dfe 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,8 +1,8 @@
 #########################################################################
 # $Id$
 #
-## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
-## optionally OpenSSL (0.9.8), libssh2 (0.17), zlib (1.2.3)
+## Makefile for building libcurl.a with MingW32 (GCC-3.2)
+## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3)
 ##
 ## Usage:
 ## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [SSPI=1] [IPV6=1] [DYN=1]
@@ -41,7 +41,7 @@ LDFLAGS = -s
 RANLIB = ranlib
 RC = windres
 RCFLAGS = --include-dir=../include -DCURLDEBUG=0 -O COFF -i
-RM = del /q /f
+RM = del /q /f > NUL 2>&1
 STRIP = strip -g
 
 ########################################################
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 8d463fae3e..32817e9159 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -1,8 +1,8 @@
 #########################################################################
 # $Id$
 #
-## Makefile for building curl.exe with MingW32 (GCC-3.2) and
-## optionally OpenSSL (0.9.8), libssh2 (0.17), zlib (1.2.3)
+## Makefile for building curl.exe with MingW32 (GCC-3.2)
+## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3)
 ##
 ## Usage:
 ## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [SSPI=1] [IPV6=1] [DYN=1]
@@ -40,7 +40,7 @@ CFLAGS = -g -O2
 LDFLAGS = -s
 RC = windres
 RCFLAGS = --include-dir=../include -O COFF -i
-RM = del /q /f
+RM = del /q /f > NUL 2>&1
 CP = copy
 
 # We may need these someday
@@ -114,11 +114,13 @@ curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES)))
 # curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES))))
 # vpath %.c ../lib
 
+RESOURCE = curl.res
+
 .SUFFIXES: .rc .res
 
 all: curl.exe
 
-curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
+curl.exe: $(RESOURCE) $(curl_OBJECTS) $(curl_DEPENDENCIES)
 	-$(RM) $@
 	$(LINK) $< $(curl_OBJECTS) $(curl_LDADD)
 
@@ -141,7 +143,7 @@ clean:
 ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
 	-$(RM) hugehelp.c
 endif
-	-$(RM) $(curl_OBJECTS)
+	-$(RM) $(curl_OBJECTS) $(RESOURCE)
 
 distrib: clean
 	-$(RM) $(curl_PROGRAMS)