Unverified Commit 85850265 authored by Kees Dekker's avatar Kees Dekker Committed by Daniel Stenberg
Browse files

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
parent a65a75e9

winbuild/Makefile.vc

+3 −0
Original line number Diff line number Diff line
@@ -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 $@

winbuild/MakefileBuild.vc

+15 −11
Original line number Diff line number Diff line
@@ -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)