From db1c618fcf120cfb34275c669a77eb3962b4e817 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 28 Oct 2002 19:39:58 +0000
Subject: [PATCH] Kevin Roth's patch. $(RM) instead of @erase, and it also
 passes on the USE_SSLEAY variable

---
 src/Makefile.m32 | 158 ++++++++++++++++++++++++-----------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 900797f05..e432b0d98 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -1,77 +1,81 @@
-#############################################################
-# $Id$
-#
-## Makefile for building curl.exe with MingW32 (GCC-2.95) and
-## optionally OpenSSL (0.9.6)
-##
-## Use: make -f Makefile.m32 [SSL=1] [DYN=1]
-##
-## Comments to: Troy Engel <tengel@sonic.net> or
-##              Joern Hartroth <hartroth@acm.org>
-
-CC = gcc
-STRIP = strip -s
-OPENSSL_PATH = ../../openssl-0.9.6d
-ZLIB_PATH = ../../zlib-1.1.3
-
-# We may need these someday
-# PERL = perl
-# NROFF = nroff
-
-########################################################
-## Nothing more to do below this line!
-
-INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2 -DMINGW32
-LDFLAGS = 
-COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-
-curl_PROGRAMS = curl.exe
-curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o
-curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c
-ifdef DYN
-  curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll
-  curl_LDADD = -L../lib -lcurldll
-else
-  curl_DEPENDENCIES = ../lib/libcurl.a
-  curl_LDADD = -L../lib -lcurl
-endif
-curl_LDADD += -lwsock32 -lws2_32 -lwinmm
-ifdef SSL
-  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
-endif
-ifdef ZLIB
-  curl_LDADD += -L$(ZLIB_PATH) -lz
-endif
-
-PROGRAMS = $(curl_PROGRAMS)
-SOURCES = $(curl_SOURCES)
-OBJECTS = $(curl_OBJECTS)
-
-all: curl.exe
-
-curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
-	-@erase $@
-	$(LINK) $(curl_OBJECTS) $(curl_LDADD)
-	$(STRIP) $@
-
-# We don't have nroff normally under win32
-# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
-# 	-@erase hugehelp.c
-# 	$(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-clean:
-	-@erase $(curl_OBJECTS)
-
-distrib: clean
-	-@erase $(curl_PROGRAMS)
+#############################################################
+# $Id$
+#
+## Makefile for building curl.exe with MingW32 (GCC-3.2) and
+## optionally OpenSSL (0.9.6)
+##
+## Use: make -f Makefile.m32 [SSL=1] [DYN=1]
+##
+## Comments to: Troy Engel <tengel@sonic.net> or
+##              Joern Hartroth <hartroth@acm.org>
+
+CC = gcc
+RM = rm -f
+STRIP = strip -s
+OPENSSL_PATH = ../../openssl-0.9.6g
+ZLIB_PATH = ../../zlib-1.1.3
+
+# We may need these someday
+# PERL = perl
+# NROFF = nroff
+
+########################################################
+## Nothing more to do below this line!
+
+INCLUDES = -I. -I.. -I../include
+CFLAGS = -g -O2 -DMINGW32
+ifdef SSL
+  CFLAGS += -DUSE_SSLEAY
+endif
+LDFLAGS = 
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+
+curl_PROGRAMS = curl.exe
+curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c
+ifdef DYN
+  curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll
+  curl_LDADD = -L../lib -lcurldll
+else
+  curl_DEPENDENCIES = ../lib/libcurl.a
+  curl_LDADD = -L../lib -lcurl
+endif
+curl_LDADD += -lwsock32 -lws2_32 -lwinmm
+ifdef SSL
+  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
+endif
+ifdef ZLIB
+  curl_LDADD += -L$(ZLIB_PATH) -lz
+endif
+
+PROGRAMS = $(curl_PROGRAMS)
+SOURCES = $(curl_SOURCES)
+OBJECTS = $(curl_OBJECTS)
+
+all: curl.exe
+
+curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
+	$(RM) $@
+	$(LINK) $(curl_OBJECTS) $(curl_LDADD)
+	$(STRIP) $@
+
+# We don't have nroff normally under win32
+# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
+# 	$(RM) hugehelp.c
+# 	$(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+clean:
+	$(RM) $(curl_OBJECTS)
+
+distrib: clean
+	$(RM) $(curl_PROGRAMS)