diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-08-19 23:23:50 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-08-19 23:23:50 +0000 |
| commit | d79fdbc46e3ba5b8d8a66bb0a409ddaf25f86191 (patch) | |
| tree | 0a98e877631328da3baf526ad97a8e6abed3d5e4 | |
| parent | ab13c2f814f4ee26e2ff5d796f40cebe68d359af (diff) | |
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....
| -rw-r--r-- | lib/Makefile.m32 | 8 | ||||
| -rw-r--r-- | src/Makefile.m32 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 92540b91c..0cb82ec72 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -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 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 3820f7afc..d7ace49fd 100644 --- a/src/Makefile.m32 +++ b/src/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) |