mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
ignore errors of the RM command; seems that the del command fails on W2K when the file to delete isnt found while on XP it only prints the warning but make continues....
This commit is contained in:
parent
ab13c2f814
commit
d79fdbc46e
@ -86,7 +86,7 @@ RESOURCE = libcurl.res
|
||||
all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)
|
||||
|
||||
$(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
|
||||
$(RM) $@
|
||||
-$(RM) $@
|
||||
$(AR) cru $@ $(libcurl_a_OBJECTS)
|
||||
$(RANLIB) $@
|
||||
$(STRIP) $@
|
||||
@ -94,7 +94,7 @@ $(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
|
||||
# remove the last line above to keep debug info
|
||||
|
||||
$(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENCIES)
|
||||
$(RM) $@
|
||||
-$(RM) $@
|
||||
$(CC) $(LDFLAGS) -shared -Wl,--out-implib,$(libcurl_dll_a_LIBRARY) \
|
||||
-o $@ $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
|
||||
|
||||
@ -105,10 +105,10 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
|
||||
$(RC) $(RCFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
|
||||
-$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
|
||||
|
||||
distrib: clean
|
||||
$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)
|
||||
-$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)
|
||||
|
||||
$(ARES_LIB)/libcares.a:
|
||||
$(MAKE) -C $(ARES_LIB) -f Makefile.m32
|
||||
|
@ -90,12 +90,12 @@ curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES)))
|
||||
all: curl.exe
|
||||
|
||||
curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
|
||||
$(RM) $@
|
||||
-$(RM) $@
|
||||
$(LINK) $< $(curl_OBJECTS) $(curl_LDADD)
|
||||
|
||||
# We don't have nroff normally under win32
|
||||
# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
|
||||
# $(RM) hugehelp.c
|
||||
# -$(RM) hugehelp.c
|
||||
# $(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
|
||||
|
||||
.c.o:
|
||||
@ -105,7 +105,7 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
|
||||
$(RC) $(RCFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
$(RM) $(curl_OBJECTS)
|
||||
-$(RM) $(curl_OBJECTS)
|
||||
|
||||
distrib: clean
|
||||
$(RM) $(curl_PROGRAMS)
|
||||
-$(RM) $(curl_PROGRAMS)
|
||||
|
Loading…
Reference in New Issue
Block a user