From b54bde8778dd3bab25572bf3c5ed212731712b94 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sat, 20 Jun 2009 14:37:50 -0400 Subject: [PATCH] moved dir dep rule to package level --- lib/dir.mk | 8 +++++++- lib/lists.mk | 4 ---- lib/src/files.mk | 3 --- lib/src/locks/files.mk | 3 --- tests/dir.mk | 8 +++++++- tests/lists.mk | 4 ---- tests/src/1/files.mk | 3 --- tests/src/files.mk | 3 --- tests/src/printTrace/files.mk | 3 --- 9 files changed, 14 insertions(+), 25 deletions(-) diff --git a/lib/dir.mk b/lib/dir.mk index a1b64f4..9f379fe 100644 --- a/lib/dir.mk +++ b/lib/dir.mk @@ -21,6 +21,12 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} -L_DEPS += ${L_DEPS_$P} +${L_BLDDIRS_$P}: | $${@D} + +L_BLDDIRS_$P += ${OBJSDIR_$P} +L_BLDDIRS_$P += ${DEPSDIR_$P} +L_BLDDIRS_$P += ${WORKINGDIR_$P} + +L_DEPS += ${L_DEPS_$P} L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/lib/lists.mk b/lib/lists.mk index 623a480..ca9af6b 100644 --- a/lib/lists.mk +++ b/lib/lists.mk @@ -6,7 +6,3 @@ L_DEPS_$P := # := start L_BLDDIRS_$P := # := start -L_BLDDIRS_$P += ${OBJSDIR_$P} -L_BLDDIRS_$P += ${DEPSDIR_$P} -L_BLDDIRS_$P += ${WORKINGDIR_$P} - diff --git a/lib/src/files.mk b/lib/src/files.mk index b36a4b4..fa84192 100644 --- a/lib/src/files.mk +++ b/lib/src/files.mk @@ -19,9 +19,6 @@ NEWDEPS := ${NEWSRCS:.cpp=.d} NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) -${NEWOBJSDIRS}: | $${@D} -${NEWDEPSDIRS}: | $${@D} - # Append to lists L_SRCS_$P += ${NEWSRCS} diff --git a/lib/src/locks/files.mk b/lib/src/locks/files.mk index 43908ad..7164aaf 100644 --- a/lib/src/locks/files.mk +++ b/lib/src/locks/files.mk @@ -15,9 +15,6 @@ NEWDEPS := ${NEWSRCS:.cpp=.d} NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) -${NEWOBJSDIRS}: | $${@D} -${NEWDEPSDIRS}: | $${@D} - # Append to lists L_SRCS_$P += ${NEWSRCS} diff --git a/tests/dir.mk b/tests/dir.mk index c255b3b..5b4c6be 100644 --- a/tests/dir.mk +++ b/tests/dir.mk @@ -21,6 +21,12 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} -L_DEPS += ${L_DEPS_$P} +${L_BLDDIRS_$P}: | $${@D} + +L_BLDDIRS_$P += ${OBJSDIR_$P} +L_BLDDIRS_$P += ${DEPSDIR_$P} +L_BLDDIRS_$P += ${WORKINGDIR_$P} + +L_DEPS += ${L_DEPS_$P} L_BLDDIRS += ${L_BLDDIRS_$P} diff --git a/tests/lists.mk b/tests/lists.mk index 623a480..ca9af6b 100644 --- a/tests/lists.mk +++ b/tests/lists.mk @@ -6,7 +6,3 @@ L_DEPS_$P := # := start L_BLDDIRS_$P := # := start -L_BLDDIRS_$P += ${OBJSDIR_$P} -L_BLDDIRS_$P += ${DEPSDIR_$P} -L_BLDDIRS_$P += ${WORKINGDIR_$P} - diff --git a/tests/src/1/files.mk b/tests/src/1/files.mk index 0203152..746b835 100644 --- a/tests/src/1/files.mk +++ b/tests/src/1/files.mk @@ -14,9 +14,6 @@ NEWDEPS := ${NEWSRCS:.cpp=.d} NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) -${NEWOBJSDIRS}: | $${@D} -${NEWDEPSDIRS}: | $${@D} - # Append to lists L_SRCS_$D += ${NEWSRCS} diff --git a/tests/src/files.mk b/tests/src/files.mk index 5a6b678..c2ec140 100644 --- a/tests/src/files.mk +++ b/tests/src/files.mk @@ -16,9 +16,6 @@ NEWDEPS := ${NEWSRCS:.cpp=.d} NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) -${NEWOBJSDIRS}: | $${@D} -${NEWDEPSDIRS}: | $${@D} - # Append to lists L_SRCS_$P += ${NEWSRCS} diff --git a/tests/src/printTrace/files.mk b/tests/src/printTrace/files.mk index 0203152..746b835 100644 --- a/tests/src/printTrace/files.mk +++ b/tests/src/printTrace/files.mk @@ -14,9 +14,6 @@ NEWDEPS := ${NEWSRCS:.cpp=.d} NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) -${NEWOBJSDIRS}: | $${@D} -${NEWDEPSDIRS}: | $${@D} - # Append to lists L_SRCS_$D += ${NEWSRCS} -- 2.10.2