From 2688190c40c02fd4f839c4a7d5c671744bbdc2ad Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sun, 18 Jan 2009 23:32:51 -0500 Subject: [PATCH] fixed up directory creation --- Makefile | 10 +++++++--- src/dir.mk | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cad83c9..db26a37 100644 --- a/Makefile +++ b/Makefile @@ -85,23 +85,27 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR} # how to make a directory ${BLDDIRS}: + ${Q1}${PRNTFMT} "mkdir" "$@" ${Q2}mkdir -p $@ +# cause the below directory rules to work out +.SECONDEXPANSION: + # rule to make an object file from a .cpp -${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS} +${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q1}${PRNTFMT} "${CXX}" "$@" ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< # rule to make a depend file from a .cpp # be clever and escape the / chars in file paths # DON'T simply use another sed delimiter or it can't appear in the file paths -${DEPSDIR}%.d: ${SRCSDIR}%.cpp | ${DEPSBLDDIRS} +${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q1}${PRNTFMT} "DEP" "$@" ${Q2}${CXX} -MM ${CXXFLAGS} $< | \ sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@ # rule to copy the config files into the working directory -${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR} +${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@) ${Q1}${PRNTFMT} "cp" "$@" ${Q2}cp $< $@ diff --git a/src/dir.mk b/src/dir.mk index 886c693..5f46c30 100644 --- a/src/dir.mk +++ b/src/dir.mk @@ -18,7 +18,7 @@ NEWSRCS += debug.cpp # Post dir setup -CURDIR := +CURDIR := ./ NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) NEWOBJS := ${NEWSRCS:.cpp=.o} -- 2.10.2