aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.m3213
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 01c23a1f2..6da5a1556 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,6 +1,6 @@
#############################################################
#
-## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
+## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
## optionally OpenSSL (0.9.6)
## Use: make -f Makefile.m32
##
@@ -9,9 +9,10 @@
CC = gcc
AR = ar
+RM = rm -f
RANLIB = ranlib
STRIP = strip -g
-OPENSSL_PATH = ../../openssl-0.9.6d
+OPENSSL_PATH = ../../openssl-0.9.6g
ZLIB_PATH = ../../zlib-1.1.3
########################################################
@@ -60,7 +61,7 @@ OBJECTS = $(libcurl_a_OBJECTS)
all: libcurl.a libcurl.dll libcurldll.a
libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
- -@erase libcurl.a
+ $(RM) libcurl.a
$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
$(RANLIB) libcurl.a
$(STRIP) $@
@@ -68,7 +69,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
# remove the last line above to keep debug info
libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
- -@erase $@
+ $(RM) $@
dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm
$(STRIP) $@
@@ -84,9 +85,9 @@ libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
$(COMPILE) -c $<
clean:
- -@erase $(libcurl_a_OBJECTS)
+ $(RM) $(libcurl_a_OBJECTS)
distrib: clean
- -@erase $(libcurl_a_LIBRARIES)
+ $(RM) $(libcurl_a_LIBRARIES)