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

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 46919fc2d1619dfb188dd80a221b31cf203176ea..b3d0e46070c7bb3fbc348ca2927840495781291b 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -270,3 +270,6 @@ $(MODE):
 copy_from_lib:
        echo copying .c...
        FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\
+
+clean:
+       $(MAKE) /NOLOGO /F MakefileBuild.vc $@

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 28500aeba1c17c43c4eb918a271e6ebd6eeac807..9e6810340cadecc0e2d575d16688e36eaef3b791 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -426,17 +426,7 @@ CURL_LINK = link.exe /incremental:no /libpath:"$(DIRDIST)\lib"
 #######################\r
 # Only the clean target can be used if a config was not provided.\r
 #\r
-!IF "$(CFGSET)" == "FALSE"\r
-clean:\r
-       @-erase /s *.dll 2> NUL\r
-       @-erase /s *.exp 2> NUL\r
-       @-erase /s *.idb 2> NUL\r
-       @-erase /s *.lib 2> NUL\r
-       @-erase /s *.obj 2> NUL\r
-       @-erase /s *.pch 2> NUL\r
-       @-erase /s *.pdb 2> NUL\r
-       @-erase /s *.res 2> NUL\r
-!ELSE\r
+!IF "$(CFGSET)" != "FALSE"\r
 # A mode was provided, so the library can be built.\r
 #\r
 !include CURL_OBJS.inc\r
@@ -563,3 +553,17 @@ $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
        rc $(CURL_RC_FLAGS)\r
 \r
 !ENDIF  # End of case where a config was provided.\r
+\r
+clean:\r
+       @-erase /s *.dll 2> NUL\r
+       @-erase /s *.exp 2> NUL\r
+       @-erase /s *.idb 2> NUL\r
+       @-erase /s *.lib 2> NUL\r
+       @-erase /s *.obj 2> NUL\r
+       @-erase /s *.pch 2> NUL\r
+       @-erase /s *.pdb 2> NUL\r
+       @-erase /s *.res 2> NUL\r
+       @if exist $(LIB_DIROBJ) rd /s/q $(LIB_DIROBJ)\r
+       @if exist $(CURL_DIROBJ)rd /s/q $(CURL_DIROBJ)\r
+       @if exist $(DIRDIST) rd /s/q $(DIRDIST)\r
+\r