From 5dc2e2fa885ab3cbdebf049534a95d82410871fb Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Tue, 1 Sep 2009 00:07:00 -0400 Subject: [PATCH] changed all directory usages to dir/name instead of dir/name/ --- dir.mk | 12 ++++++------ rules.mk | 4 ++-- src/Effects/dir.mk | 4 ++-- src/Effects/files.mk | 4 ++-- src/Entities/dir.mk | 4 ++-- src/Entities/files.mk | 4 ++-- src/GameStates/dir.mk | 4 ++-- src/GameStates/files.mk | 4 ++-- src/config/dir.mk | 4 ++-- src/config/files.mk | 4 ++-- src/dir.mk | 4 ++-- src/files.mk | 16 ++++++++-------- src/graphics/dir.mk | 4 ++-- src/graphics/files.mk | 4 ++-- src/input/dir.mk | 4 ++-- src/input/files.mk | 4 ++-- vars.mk | 34 +++++++++++++++++----------------- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/dir.mk b/dir.mk index 6bad4d4..80771cb 100644 --- a/dir.mk +++ b/dir.mk @@ -7,19 +7,19 @@ T_DIRNAME := physics DIRNAME := ${T_DIRNAME} D := ${DIRNAME} P := ${DIRNAME} -CURDIR := ${DIRNAME}/ +CURDIR := ${DIRNAME} T_DIRNAME := -include ${CURDIR}${G_VARSMK} +include ${CURDIR}/${G_VARSMK} -include ${CURDIR}${G_LISTSMK} +include ${CURDIR}/${G_LISTSMK} -include ${SRCSDIR_$P}${G_DIRMK} +include ${SRCSDIR_$P}/${G_DIRMK} -include ${CURDIR}${G_TVARSMK} +include ${CURDIR}/${G_TVARSMK} -include ${CURDIR}${G_RULESMK} +include ${CURDIR}/${G_RULESMK} L_BLDDIRS_$P += ${DSTCFGDIR_$P} L_BLDDIRS_$P += ${DSTLIBSDIR_$P} diff --git a/rules.mk b/rules.mk index 258010c..4a92b77 100644 --- a/rules.mk +++ b/rules.mk @@ -4,11 +4,11 @@ ${G_OBJS_PHYSICS}: ${L_OBJS_$P} ${G_DEPS_PHYSICS}: ${L_DEPS_$P} -${TARGETTMP_$D}: ${BINDIR_$P}${LIBSDIRNAME_$P}${SONAME_${G_LIB}} +${TARGETTMP_$D}: ${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_LIB}} # rule to copy library lib into the working directory -${BINDIR_$P}${LIBSDIRNAME_$P}${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D} +${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D} ${cmd-cp} # how to link the main target diff --git a/src/Effects/dir.mk b/src/Effects/dir.mk index 323d056..3a893a3 100644 --- a/src/Effects/dir.mk +++ b/src/Effects/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/Effects/files.mk b/src/Effects/files.mk index 2ca7154..217d0c9 100644 --- a/src/Effects/files.mk +++ b/src/Effects/files.mk @@ -10,8 +10,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/Entities/dir.mk b/src/Entities/dir.mk index e652b0d..c224ca6 100644 --- a/src/Entities/dir.mk +++ b/src/Entities/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/Entities/files.mk b/src/Entities/files.mk index 41f88b6..bffa3ac 100644 --- a/src/Entities/files.mk +++ b/src/Entities/files.mk @@ -14,8 +14,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/GameStates/dir.mk b/src/GameStates/dir.mk index 067f5e8..5c1e4f5 100644 --- a/src/GameStates/dir.mk +++ b/src/GameStates/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/GameStates/files.mk b/src/GameStates/files.mk index 04b4682..bfd90cd 100644 --- a/src/GameStates/files.mk +++ b/src/GameStates/files.mk @@ -10,8 +10,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/config/dir.mk b/src/config/dir.mk index 4f400a3..a3422e6 100644 --- a/src/config/dir.mk +++ b/src/config/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/config/files.mk b/src/config/files.mk index 1370fd2..e01bfa6 100644 --- a/src/config/files.mk +++ b/src/config/files.mk @@ -9,8 +9,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/dir.mk b/src/dir.mk index 165ec69..c436733 100644 --- a/src/dir.mk +++ b/src/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/files.mk b/src/files.mk index 06037b4..246a42d 100644 --- a/src/files.mk +++ b/src/files.mk @@ -13,17 +13,17 @@ NEWSRCS += CollisionInfo.cpp NEWDIRS := # := start; empty -NEWDIRS += Entities/ -NEWDIRS += GameStates/ -NEWDIRS += Effects/ -NEWDIRS += config/ -NEWDIRS += input/ -NEWDIRS += graphics/ +NEWDIRS += Entities +NEWDIRS += GameStates +NEWDIRS += Effects +NEWDIRS += config +NEWDIRS += input +NEWDIRS += graphics ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/graphics/dir.mk b/src/graphics/dir.mk index 3e03109..a3a5680 100644 --- a/src/graphics/dir.mk +++ b/src/graphics/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/graphics/files.mk b/src/graphics/files.mk index bb292dd..37cab4a 100644 --- a/src/graphics/files.mk +++ b/src/graphics/files.mk @@ -7,8 +7,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/src/input/dir.mk b/src/input/dir.mk index 5b593b6..d4401f4 100644 --- a/src/input/dir.mk +++ b/src/input/dir.mk @@ -7,8 +7,8 @@ include ${F_STACKPUSH} T_DIRNAME := -include ${CURDIR}${G_FILESMK} -include $(addsuffix ${G_DIRMK},${NEWDIRS}) +include ${CURDIR}/${G_FILESMK} +include $(addsuffix /${G_DIRMK},${NEWDIRS}) include ${F_STACKPOP} diff --git a/src/input/files.mk b/src/input/files.mk index 264545a..a1b6ed2 100644 --- a/src/input/files.mk +++ b/src/input/files.mk @@ -7,8 +7,8 @@ NEWDIRS := # := start; empty ################################################################################ -NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS}) -NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS}) +NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS}) +NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS}) # Append to lists diff --git a/vars.mk b/vars.mk index 573f756..de8996b 100644 --- a/vars.mk +++ b/vars.mk @@ -4,37 +4,37 @@ CXXFLAGS_$P := ${G_CXXFLAGS} LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,libs/ -rdynamic LIBS_$P := ${G_LIBSDL} ${G_LIBGL} -SRCSDIR_$P := ${CURDIR}${G_SRCSDIR} -DEPSDIR_$P := ${CURDIR}${G_DEPSDIR} -OBJSDIR_$P := ${CURDIR}${G_OBJSDIR} -BINDIR_$P := ${CURDIR}${G_BINDIR} +SRCSDIR_$P := ${CURDIR}/${G_SRCSDIR} +DEPSDIR_$P := ${CURDIR}/${G_DEPSDIR} +OBJSDIR_$P := ${CURDIR}/${G_OBJSDIR} +BINDIR_$P := ${CURDIR}/${G_BINDIR} # HACK -T_INCDIRS_$P := ${SRCSDIR_$P} lib/include/ +T_INCDIRS_$P := ${SRCSDIR_$P} lib/include INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P}) T_INCDIRS_$P := # empty -CFGDIRNAME_$P := configs/ -SRCCFGDIR_$P := ${CURDIR}${CFGDIRNAME_$P} -DSTCFGDIR_$P := ${BINDIR_$P}${CFGDIRNAME_$P} +CFGDIRNAME_$P := configs +SRCCFGDIR_$P := ${CURDIR}/${CFGDIRNAME_$P} +DSTCFGDIR_$P := ${BINDIR_$P}/${CFGDIRNAME_$P} CFGS_$P := # := start CFGS_$P += keys.cfg -CFGS_$P := $(addprefix ${DSTCFGDIR_$P},${CFGS_$P}) +CFGS_$P := $(addprefix ${DSTCFGDIR_$P}/,${CFGS_$P}) -LIBSDIRNAME_$P := libs/ -SRCLIBSDIR_$P := ${CURDIR}${LIBSDIRNAME_$P} +LIBSDIRNAME_$P := libs +SRCLIBSDIR_$P := ${CURDIR}/${LIBSDIRNAME_$P} ifeq (${G_BUILD},${B_WIN32}) DSTLIBSDIR_$P := ${BINDIR_$P} else - DSTLIBSDIR_$P := ${BINDIR_$P}${LIBSDIRNAME_$P} + DSTLIBSDIR_$P := ${BINDIR_$P}/${LIBSDIRNAME_$P} endif LIBSTXT_$P := # := start LIBSTXT_$P += COPYING-SDL LIBSTXT_$P += README-SDL LIBSTXT_$P += VERSION-SDL -LIBSTXT_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P}) +LIBSTXT_$P := $(addprefix ${DSTLIBSDIR_$P}/,${LIBSTXT_$P}) LIBSCPY_$P := # := start ifeq (${G_BUILD},${B_WIN32}) @@ -42,19 +42,19 @@ ifeq (${G_BUILD},${B_WIN32}) else LIBSCPY_$P += libSDL-1.2.so.0 endif -LIBSCPY_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSCPY_$P}) +LIBSCPY_$P := $(addprefix ${DSTLIBSDIR_$P}/,${LIBSCPY_$P}) SRCTXTDIR_$P := ${CURDIR} DSTTXTDIR_$P := ${BINDIR_$P} TXT_$P := # := start TXT_$P += COPYING -TXT_$P := $(addprefix ${DSTTXTDIR_$P},${TXT_$P}) +TXT_$P := $(addprefix ${DSTTXTDIR_$P}/,${TXT_$P}) ifeq (${G_BUILD},${B_WIN32}) TARGETNAME_$P := run_physics.exe else TARGETNAME_$P := run_physics endif -TARGETTMP_$P := ${OBJSDIR_$P}${TARGETNAME_$P} -TARGET_$P := ${BINDIR_$P}${TARGETNAME_$P} +TARGETTMP_$P := ${OBJSDIR_$P}/${TARGETNAME_$P} +TARGET_$P := ${BINDIR_$P}/${TARGETNAME_$P} -- 2.10.2