From 858502652408d060c80e9626d7cf89183ebe6a94 Mon Sep 17 00:00:00 2001 From: kdekker Date: Wed, 4 Apr 2018 11:32:19 +0200 Subject: winbuild: make the clean target work without build-type Due to the check in Makefile.vc and MakefileBuild.vc, no make call can be invoked unless a build-type was specified. However, a clean target only existed when a build type was specified. As a result, the clean target was unreachable. Made clean target unconditional. Closes #2455 --- winbuild/MakefileBuild.vc | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'winbuild/MakefileBuild.vc') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 28500aeba..9e6810340 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -426,17 +426,7 @@ CURL_LINK = link.exe /incremental:no /libpath:"$(DIRDIST)\lib" ####################### # Only the clean target can be used if a config was not provided. # -!IF "$(CFGSET)" == "FALSE" -clean: - @-erase /s *.dll 2> NUL - @-erase /s *.exp 2> NUL - @-erase /s *.idb 2> NUL - @-erase /s *.lib 2> NUL - @-erase /s *.obj 2> NUL - @-erase /s *.pch 2> NUL - @-erase /s *.pdb 2> NUL - @-erase /s *.res 2> NUL -!ELSE +!IF "$(CFGSET)" != "FALSE" # A mode was provided, so the library can be built. # !include CURL_OBJS.inc @@ -563,3 +553,17 @@ $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc rc $(CURL_RC_FLAGS) !ENDIF # End of case where a config was provided. + +clean: + @-erase /s *.dll 2> NUL + @-erase /s *.exp 2> NUL + @-erase /s *.idb 2> NUL + @-erase /s *.lib 2> NUL + @-erase /s *.obj 2> NUL + @-erase /s *.pch 2> NUL + @-erase /s *.pdb 2> NUL + @-erase /s *.res 2> NUL + @if exist $(LIB_DIROBJ) rd /s/q $(LIB_DIROBJ) + @if exist $(CURL_DIROBJ)rd /s/q $(CURL_DIROBJ) + @if exist $(DIRDIST) rd /s/q $(DIRDIST) + -- cgit v1.2.3