]> granicus.if.org Git - curl/commitdiff
ignore errors of the RM command; seems that the del command fails on W2K when the...
authorGunter Knauf <gk@gknw.de>
Sun, 19 Aug 2007 23:23:50 +0000 (23:23 +0000)
committerGunter Knauf <gk@gknw.de>
Sun, 19 Aug 2007 23:23:50 +0000 (23:23 +0000)
lib/Makefile.m32
src/Makefile.m32

index 92540b91c84aa6fb0d052c878f0ec0382eda1fbd..0cb82ec723c9a37df44cf84a671d7c96f07c9923 100644 (file)
@@ -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
index 3820f7afcfdf8eb294b2416485a367b9868bc62c..d7ace49fdf721fd1436d5d734057f38465d43421 100644 (file)
@@ -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)