From 016c4cab0fad47663349e8dbc148bbe059ee67b6 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sat, 20 Jun 2009 14:34:23 -0400 Subject: [PATCH] moved mkdir cmd to root --- Makefile | 3 ++- lib/dir.mk | 1 + lib/rules.mk | 5 ----- lists.mk | 2 ++ rules.mk | 5 +++++ tests/dir.mk | 1 + tests/rules.mk | 5 ----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 5fa4417..0e84727 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,6 @@ G_TVARSMK := tvars.mk include packages.mk include targets.mk -include ${G_RULESMK} include ${G_VARSMK} @@ -30,6 +29,8 @@ include ${G_LISTSMK} include lib/${G_DIRMK} include tests/${G_DIRMK} +include ${G_RULESMK} + # Do not include deps files when doing a clean operation ifeq ($(filter ${L_CLEANCMDS},${MAKECMDGOALS}),) -include ${L_DEPS} diff --git a/lib/dir.mk b/lib/dir.mk index 95b0e27..a1b64f4 100644 --- a/lib/dir.mk +++ b/lib/dir.mk @@ -22,4 +22,5 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} L_DEPS += ${L_DEPS_$P} +L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/lib/rules.mk b/lib/rules.mk index 47656e5..9827990 100644 --- a/lib/rules.mk +++ b/lib/rules.mk @@ -28,11 +28,6 @@ ${TARGETTMP_$P}: ${L_OBJS_$P} | $${@D} ${TARGET_$P}: ${TARGETTMP_$P} | $${@D} ${cmd-cp} -# how to make a directory -${L_BLDDIRS_$P}: - ${Q1}${PRNTFMT} "mkdir" "$@" - ${Q2}mkdir $@ - # rule to make an object file from a .cpp ${OBJSDIR_$P}%.o: ${SRCSDIR_$P}%.cpp | $${@D} ${cmd-cpptoobj} diff --git a/lists.mk b/lists.mk index 019794a..15bec12 100644 --- a/lists.mk +++ b/lists.mk @@ -2,3 +2,5 @@ L_CLEANCMDS := # empty L_DEPS := # empty +L_BLDDIRS := # empty + diff --git a/rules.mk b/rules.mk index 2011d30..8fb4f9b 100644 --- a/rules.mk +++ b/rules.mk @@ -19,3 +19,8 @@ define cmd-cpptodep ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | sed 's/\(^.*\):/$(subst /,\/,${@:${DEPSDIR}%.d=${OBJSDIR}%.o} $@):/' > $@ endef + +${L_BLDDIRS}: + ${Q1}${PRNTFMT} "mkdir" "$@" + ${Q2}mkdir $@ + diff --git a/tests/dir.mk b/tests/dir.mk index 0c8e448..c255b3b 100644 --- a/tests/dir.mk +++ b/tests/dir.mk @@ -22,4 +22,5 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} L_DEPS += ${L_DEPS_$P} +L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/tests/rules.mk b/tests/rules.mk index bf3aaa1..67aaab6 100644 --- a/tests/rules.mk +++ b/tests/rules.mk @@ -6,11 +6,6 @@ ${G_DEPS_TESTS}: ${L_DEPS_$P} tests/bind/libbear.so.0: lib/bind/libbear.so.0.0 | $${@D} ${cmd-cp} -# how to make a directory -${L_BLDDIRS_$P}: - ${Q1}${PRNTFMT} "mkdir" "$@" - ${Q2}mkdir $@ - # rule to make an object file from a .cpp ${OBJSDIR_$P}%.o: ${SRCSDIR_$P}%.cpp | $${@D} ${cmd-cpptoobj} -- 2.10.2