From 8e2aacdf3a199057a298c57eeb0714165294b5b0 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Wed, 1 Jul 2009 15:05:40 -0400 Subject: [PATCH] created cleanrules.mk --- Makefile.d/cleanrules.mk | 36 ++++++++++++++++++++++++++++++++++++ lib/rules.mk | 32 +++----------------------------- tests/rules.mk | 33 +++------------------------------ 3 files changed, 42 insertions(+), 59 deletions(-) create mode 100644 Makefile.d/cleanrules.mk diff --git a/Makefile.d/cleanrules.mk b/Makefile.d/cleanrules.mk new file mode 100644 index 0000000..5fa7307 --- /dev/null +++ b/Makefile.d/cleanrules.mk @@ -0,0 +1,36 @@ + +# Clean rules that packages can include +# +# Requires T to be set to the desired suffix + +L_CLEANCMDS += cleanbin-$T +cleanbin: cleanbin-$T +.PHONY: cleanbin-$T +cleanbin-$T: + ${Q1}${PRNTFMT} "rm" "${BINDIR}" + ${Q2}rm -rf ${BINDIR} + +L_CLEANCMDS += cleanobjs-$T +cleanobjs: cleanobjs-$T +.PHONY: cleanobjs-$T +cleanobjs-$T: + ${Q1}${PRNTFMT} "rm" "${OBJSDIR}" + ${Q2}rm -rf ${OBJSDIR} + +L_CLEANCMDS += cleandeps-$T +cleandeps: cleandeps-$T +.PHONY: cleandeps-$T +cleandeps-$T: + ${Q1}${PRNTFMT} "rm" "${DEPSDIR}" + ${Q2}rm -rf ${DEPSDIR} + +L_CLEANCMDS += clean-$T +clean: clean-$T +.PHONY: clean-$T +clean-$T: cleanobjs-$T cleanbin-$T + +L_CLEANCMDS += cleanall-$T +cleanall: cleanall-$T +.PHONY: cleanall-$T +cleanall-$T: cleanbin-$T cleanobjs-$T cleandeps-$T + diff --git a/lib/rules.mk b/lib/rules.mk index f13cda2..2b50788 100644 --- a/lib/rules.mk +++ b/lib/rules.mk @@ -37,33 +37,7 @@ ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} ${cmd-cpptodep} -L_CLEANCMDS += cleanbin-$P -cleanbin: cleanbin-$P -.PHONY: cleanbin-$P -cleanbin-$P: - ${Q1}${PRNTFMT} "rm" "${BINDIR}" - ${Q2}rm -rf ${BINDIR} +T := $P + include Makefile.d/cleanrules.mk +T := -L_CLEANCMDS += cleanobjs-$P -cleanobjs: cleanobjs-$P -.PHONY: cleanobjs-$P -cleanobjs-$P: - ${Q1}${PRNTFMT} "rm" "${OBJSDIR}" - ${Q2}rm -rf ${OBJSDIR} - -L_CLEANCMDS += cleandeps-$P -cleandeps: cleandeps-$P -.PHONY: cleandeps-$P -cleandeps-$P: - ${Q1}${PRNTFMT} "rm" "${DEPSDIR}" - ${Q2}rm -rf ${DEPSDIR} - -L_CLEANCMDS += clean-$P -clean: clean-$P -.PHONY: clean-$P -clean-$P: cleanobjs-$P cleanbin-$P - -L_CLEANCMDS += cleanall-$P -cleanall: cleanall-$P -.PHONY: cleanall-$P -cleanall-$P: cleanbin-$P cleanobjs-$P cleandeps-$P diff --git a/tests/rules.mk b/tests/rules.mk index 0c5bcf1..9639031 100644 --- a/tests/rules.mk +++ b/tests/rules.mk @@ -15,34 +15,7 @@ ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} ${cmd-cpptodep} -L_CLEANCMDS += cleanbin-$P -cleanbin: cleanbin-$P -.PHONY: cleanbin-$P -cleanbin-$P: - ${Q1}${PRNTFMT} "rm" "${BINDIR}" - ${Q2}rm -rf ${BINDIR} - -L_CLEANCMDS += cleanobjs-$P -cleanobjs: cleanobjs-$P -.PHONY: cleanobjs-$P -cleanobjs-$P: - ${Q1}${PRNTFMT} "rm" "${OBJSDIR}" - ${Q2}rm -rf ${OBJSDIR} - -L_CLEANCMDS += cleandeps-$P -cleandeps: cleandeps-$P -.PHONY: cleandeps-$P -cleandeps-$P: - ${Q1}${PRNTFMT} "rm" "${DEPSDIR}" - ${Q2}rm -rf ${DEPSDIR} - -L_CLEANCMDS += clean-$P -clean: clean-$P -.PHONY: clean-$P -clean-$P: cleanobjs-$P cleanbin-$P - -L_CLEANCMDS += cleanall-$P -cleanall: cleanall-$P -.PHONY: cleanall-$P -cleanall-$P: cleanbin-$P cleanobjs-$P cleandeps-$P +T := $P + include Makefile.d/cleanrules.mk +T := -- 2.10.2