Kevin Roth's patch. $(RM) instead of @erase, and it also passes on the

USE_SSLEAY variable

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