diff --git a/mk/init.mk b/mk/init.mk index 56265cf..9867389 100644 --- a/mk/init.mk +++ b/mk/init.mk @@ -57,6 +57,10 @@ $V += ${$V.$Q:U} ${$V.$Q.${COMPILER_TYPE}:U} .endfor .endfor +# del is unnecessarily verbose for +# what we need. +RM?= del /q > nul 2>&1 + .if ${COMPILER_TYPE} == "msvc" # cl.exe wants us to pass some arguments # to the linker instead of to it. diff --git a/mk/lib.mk b/mk/lib.mk index 2eda0be..b456ffd 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -74,7 +74,7 @@ OBJS+= ${SRCS:T:N*.h:R:S/$/.obj/g} ${LIB}.lib: ${OBJS} @${META_NOECHO} building standard ${LIB} library - @del /q ${.TARGET} 2> nul + @${RM} ${.TARGET} lib /nologo /OUT:${.TARGET} ${OBJS} # cl uses the /link argument to pass arguments to the linker @@ -82,20 +82,20 @@ ${LIB}.lib: ${OBJS} _ := ${${COMPILER_TYPE} == "msvc":?/link:} ${LIB}.dll: ${LIB}.lib ${DPADD} @${META_NOECHO} building shared ${LIB} library (version ${SHLIB_FULLVERSION}) - @del /q ${.TARGET} 2> nul + @${RM} ${.TARGET} ${SHLIB_LD} ${OBJS} ${LDADD} ${SHLIB_LDADD} \ $_ ${LDFLAGS:N$_} ${LD_shared} ${CC_OUT:N$_} .if !empty(SHLIB_LINKS) - del /q ${SHLIB_LINKS} & ${SHLIB_LINKS:O:u:@x@mklink $x ${.TARGET}&@} + ${RM} ${SHLIB_LINKS} & ${SHLIB_LINKS:O:u:@x@mklink $x ${.TARGET}&@} .endif .if !target(clean) cleanlib: .PHONY - -del /q ${CLEANFILES} - -del /q ${LIB}.lib ${OBJS} - -del /q ${LIB}.dll + -${RM} ${CLEANFILES} + ${RM} ${LIB}.lib ${OBJS} + ${RM} ${LIB}.dll .if !empty(SHLIB_LINKS) - -del /q ${SHLIB_LINKS} + ${RM} ${SHLIB_LINKS} .endif clean: cleanlib diff --git a/mk/prog.mk b/mk/prog.mk index af0aa3d..92f57eb 100644 --- a/mk/prog.mk +++ b/mk/prog.mk @@ -59,8 +59,7 @@ realbuild: ${PROG}.exe .if !target(clean) cleanprog: - del /q \ - ${PROG}.exe ${OBJS} ${CLEANFILES} + ${RM} ${PROG}.exe ${OBJS} ${CLEANFILES} clean: cleanprog cleandir: cleanprog