From bf2e09eebfeac8157821a83b195cfc6eef05e5ce Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Mon, 22 Jun 2009 23:46:38 -0400 Subject: [PATCH] removed srcpath --- lib/src/dir.mk | 6 +----- lib/src/files.mk | 18 +++++++----------- lib/src/locks/dir.mk | 6 +----- lib/src/locks/files.mk | 18 +++++++----------- tests/src/1/dir.mk | 6 +----- tests/src/1/files.mk | 18 +++++++----------- tests/src/dir.mk | 6 +----- tests/src/files.mk | 18 +++++++----------- tests/src/printTrace/dir.mk | 6 +----- tests/src/printTrace/files.mk | 18 +++++++----------- 10 files changed, 40 insertions(+), 80 deletions(-) diff --git a/lib/src/dir.mk b/lib/src/dir.mk index 37c1041..122aae5 100644 --- a/lib/src/dir.mk +++ b/lib/src/dir.mk @@ -23,18 +23,14 @@ T_DIRNAME := CURDIR_$D := ${CURDIR} CURDIR := ${CURDIR_$D}${DIRNAME}/ -# top define -SRCPATH := - include ${CURDIR}${G_FILESMK} -include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS})) +include $(addsuffix ${G_DIRMK},${NEWDIRS}) # restore CURDIR := ${CURDIR_$D} -SRCPATH := DIRNAME := ${DIRNAME_$D} D := ${D_$D} diff --git a/lib/src/files.mk b/lib/src/files.mk index fa84192..df4ee64 100644 --- a/lib/src/files.mk +++ b/lib/src/files.mk @@ -11,20 +11,16 @@ NEWDIRS += locks/ ################################################################################ -NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS}) -NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS}) -NEWOBJS := ${NEWSRCS:.cpp=.o} -NEWDEPS := ${NEWSRCS:.cpp=.d} - -NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) -NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) # Append to lists L_SRCS_$P += ${NEWSRCS} -L_OBJS_$P += $(addprefix ${OBJSDIR_$P},${NEWOBJS}) -L_DEPS_$P += $(addprefix ${DEPSDIR_$P},${NEWDEPS}) -L_BLDDIRS_$P += ${NEWOBJSDIRS} -L_BLDDIRS_$P += ${NEWDEPSDIRS} +L_OBJS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o} +L_DEPS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d} + +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%} +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%} diff --git a/lib/src/locks/dir.mk b/lib/src/locks/dir.mk index c5befc9..d9a0523 100644 --- a/lib/src/locks/dir.mk +++ b/lib/src/locks/dir.mk @@ -23,18 +23,14 @@ T_DIRNAME := CURDIR_$D := ${CURDIR} CURDIR := ${CURDIR_$D}${DIRNAME}/ -SRCPATH_$D := ${SRCPATH} -SRCPATH := ${SRCPATH_$D}${DIRNAME}/ - include ${CURDIR}${G_FILESMK} -include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS})) +include $(addsuffix ${G_DIRMK},${NEWDIRS}) # restore CURDIR := ${CURDIR_$D} -SRCPATH := ${SRCPATH_$D} DIRNAME := ${DIRNAME_$D} D := ${D_$D} diff --git a/lib/src/locks/files.mk b/lib/src/locks/files.mk index 7164aaf..bbd538c 100644 --- a/lib/src/locks/files.mk +++ b/lib/src/locks/files.mk @@ -7,20 +7,16 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS}) -NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS}) -NEWOBJS := ${NEWSRCS:.cpp=.o} -NEWDEPS := ${NEWSRCS:.cpp=.d} - -NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) -NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) # Append to lists L_SRCS_$P += ${NEWSRCS} -L_OBJS_$P += $(addprefix ${OBJSDIR_$P},${NEWOBJS}) -L_DEPS_$P += $(addprefix ${DEPSDIR_$P},${NEWDEPS}) -L_BLDDIRS_$P += ${NEWOBJSDIRS} -L_BLDDIRS_$P += ${NEWDEPSDIRS} +L_OBJS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o} +L_DEPS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d} + +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%} +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%} diff --git a/tests/src/1/dir.mk b/tests/src/1/dir.mk index d1ce45b..deebd10 100644 --- a/tests/src/1/dir.mk +++ b/tests/src/1/dir.mk @@ -23,9 +23,6 @@ T_DIRNAME := CURDIR_$D := ${CURDIR} CURDIR := ${CURDIR_$D}${DIRNAME}/ -SRCPATH_$D := ${SRCPATH} -SRCPATH := ${SRCPATH_$D}${DIRNAME}/ - include ${CURDIR}${G_VARSMK} @@ -33,7 +30,7 @@ include ${CURDIR}${G_LISTSMK} include ${CURDIR}${G_FILESMK} -include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS})) +include $(addsuffix ${G_DIRMK},${NEWDIRS}) L_SRCS_$P += ${L_SRCS_$D} L_OBJS_$P += ${L_OBJS_$D} @@ -47,7 +44,6 @@ include ${CURDIR}${G_RULESMK} # restore CURDIR := ${CURDIR_$D} -SRCPATH := ${SRCPATH_$D} DIRNAME := ${DIRNAME_$D} D := ${D_$D} diff --git a/tests/src/1/files.mk b/tests/src/1/files.mk index 746b835..6efe3a9 100644 --- a/tests/src/1/files.mk +++ b/tests/src/1/files.mk @@ -6,20 +6,16 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS}) -NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS}) -NEWOBJS := ${NEWSRCS:.cpp=.o} -NEWDEPS := ${NEWSRCS:.cpp=.d} - -NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) -NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) # Append to lists L_SRCS_$D += ${NEWSRCS} -L_OBJS_$D += $(addprefix ${OBJSDIR_$P},${NEWOBJS}) -L_DEPS_$D += $(addprefix ${DEPSDIR_$P},${NEWDEPS}) -L_BLDDIRS_$P += ${NEWOBJSDIRS} -L_BLDDIRS_$P += ${NEWDEPSDIRS} +L_OBJS_$D += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o} +L_DEPS_$D += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d} + +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%} +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%} diff --git a/tests/src/dir.mk b/tests/src/dir.mk index 37c1041..122aae5 100644 --- a/tests/src/dir.mk +++ b/tests/src/dir.mk @@ -23,18 +23,14 @@ T_DIRNAME := CURDIR_$D := ${CURDIR} CURDIR := ${CURDIR_$D}${DIRNAME}/ -# top define -SRCPATH := - include ${CURDIR}${G_FILESMK} -include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS})) +include $(addsuffix ${G_DIRMK},${NEWDIRS}) # restore CURDIR := ${CURDIR_$D} -SRCPATH := DIRNAME := ${DIRNAME_$D} D := ${D_$D} diff --git a/tests/src/files.mk b/tests/src/files.mk index c2ec140..fd5b78a 100644 --- a/tests/src/files.mk +++ b/tests/src/files.mk @@ -8,20 +8,16 @@ NEWDIRS += printTrace/ ################################################################################ -NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS}) -NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS}) -NEWOBJS := ${NEWSRCS:.cpp=.o} -NEWDEPS := ${NEWSRCS:.cpp=.d} - -NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) -NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) # Append to lists L_SRCS_$P += ${NEWSRCS} -L_OBJS_$P += $(addprefix ${OBJSDIR_$P},${NEWOBJS}) -L_DEPS_$P += $(addprefix ${DEPSDIR_$P},${NEWDEPS}) -L_BLDDIRS_$P += ${NEWOBJSDIRS} -L_BLDDIRS_$P += ${NEWDEPSDIRS} +L_OBJS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o} +L_DEPS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d} + +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%} +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%} diff --git a/tests/src/printTrace/dir.mk b/tests/src/printTrace/dir.mk index 08285b6..176d55d 100644 --- a/tests/src/printTrace/dir.mk +++ b/tests/src/printTrace/dir.mk @@ -23,9 +23,6 @@ T_DIRNAME := CURDIR_$D := ${CURDIR} CURDIR := ${CURDIR_$D}${DIRNAME}/ -SRCPATH_$D := ${SRCPATH} -SRCPATH := ${SRCPATH_$D}${DIRNAME}/ - include ${CURDIR}${G_VARSMK} @@ -33,7 +30,7 @@ include ${CURDIR}${G_LISTSMK} include ${CURDIR}${G_FILESMK} -include $(addprefix ${SRCSDIR_$P},$(addsuffix ${G_DIRMK},${NEWDIRS})) +include $(addsuffix ${G_DIRMK},${NEWDIRS}) L_SRCS_$P += ${L_SRCS_$D} L_OBJS_$P += ${L_OBJS_$D} @@ -47,7 +44,6 @@ include ${CURDIR}${G_RULESMK} # restore CURDIR := ${CURDIR_$D} -SRCPATH := ${SRCPATH_$D} DIRNAME := ${DIRNAME_$D} D := ${D_$D} diff --git a/tests/src/printTrace/files.mk b/tests/src/printTrace/files.mk index 746b835..6efe3a9 100644 --- a/tests/src/printTrace/files.mk +++ b/tests/src/printTrace/files.mk @@ -6,20 +6,16 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS}) -NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS}) -NEWOBJS := ${NEWSRCS:.cpp=.o} -NEWDEPS := ${NEWSRCS:.cpp=.d} - -NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS}) -NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) # Append to lists L_SRCS_$D += ${NEWSRCS} -L_OBJS_$D += $(addprefix ${OBJSDIR_$P},${NEWOBJS}) -L_DEPS_$D += $(addprefix ${DEPSDIR_$P},${NEWDEPS}) -L_BLDDIRS_$P += ${NEWOBJSDIRS} -L_BLDDIRS_$P += ${NEWDEPSDIRS} +L_OBJS_$D += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o} +L_DEPS_$D += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d} + +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%} +L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%} -- 2.10.2