aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkdekker <kees.dekker@infor.com>2018-04-04 11:32:19 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-04-06 14:43:33 +0200
commit858502652408d060c80e9626d7cf89183ebe6a94 (patch)
tree52cd37c366df5b51c6414870ec5aac6eed86c55e
parenta65a75e9b3cf0f2d5572105ab54a6a0b96f1d71d (diff)
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
-rw-r--r--winbuild/Makefile.vc3
-rw-r--r--winbuild/MakefileBuild.vc26
2 files changed, 18 insertions, 11 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 46919fc2d..b3d0e4607 100644
--- 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 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)
+