moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Kevin Roth's fixes that use $(RM) instead of @erase and modified SSL version

Browse Source
This commit is contained in:
Daniel Stenberg 2002-10-28 19:38:46 +00:00
parent 6a88c8d845
commit 01bdfa7b6d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Makefile.m32
View File

@ -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) ## optionally OpenSSL (0.9.6)
## Use: make -f Makefile.m32 ## Use: make -f Makefile.m32
## ##
@ -9,9 +9,10 @@
CC = gcc CC = gcc
AR = ar AR = ar
RM = rm -f
RANLIB = ranlib RANLIB = ranlib
STRIP = strip -g STRIP = strip -g
OPENSSL_PATH = ../../openssl-0.9.6d OPENSSL_PATH = ../../openssl-0.9.6g
ZLIB_PATH = ../../zlib-1.1.3 ZLIB_PATH = ../../zlib-1.1.3
######################################################## ########################################################
@ -60,7 +61,7 @@ OBJECTS = $(libcurl_a_OBJECTS)
all: libcurl.a libcurl.dll libcurldll.a all: libcurl.a libcurl.dll libcurldll.a
libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-@erase libcurl.a $(RM) libcurl.a
$(AR) cru libcurl.a $(libcurl_a_OBJECTS) $(AR) cru libcurl.a $(libcurl_a_OBJECTS)
$(RANLIB) libcurl.a $(RANLIB) libcurl.a
$(STRIP) $@ $(STRIP) $@
@ -68,7 +69,7 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
# remove the last line above to keep debug info # remove the last line above to keep debug info
libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o 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 dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm
$(STRIP) $@ $(STRIP) $@
@ -84,9 +85,9 @@ libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
$(COMPILE) -c $< $(COMPILE) -c $<
clean: clean:
-@erase $(libcurl_a_OBJECTS) $(RM) $(libcurl_a_OBJECTS)
distrib: clean distrib: clean
-@erase $(libcurl_a_LIBRARIES) $(RM) $(libcurl_a_LIBRARIES)