changed all directory usages to dir/name instead of dir/name/

diff --git a/Makefile.d/stackpush.mk b/Makefile.d/stackpush.mk
index 59a812f..74ef0c0 100644 (file)
--- a/Makefile.d/stackpush.mk
+++ b/Makefile.d/stackpush.mk
@@ -20,5 +20,5 @@ T := $D_TEMP
 T :=
 
 CURDIR_$D   := ${CURDIR}
-CURDIR      := ${CURDIR_$D}${DIRNAME}/
+CURDIR      := ${CURDIR_$D}/${DIRNAME}
 

diff --git a/lib/dir.mk b/lib/dir.mk
index 546e3aa..fb6824a 100644 (file)
--- a/lib/dir.mk
+++ b/lib/dir.mk
@@ -7,17 +7,17 @@ T_DIRNAME := lib
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
 P       := ${P_LIB}
-CURDIR  := ${DIRNAME}/
+CURDIR  := ${DIRNAME}
 
 T_DIRNAME :=
 
-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}: | $${@D}
 

diff --git a/lib/src/dir.mk b/lib/src/dir.mk
index 3f7e5ed..c436733 100644 (file)
--- a/lib/src/dir.mk
+++ b/lib/src/dir.mk
@@ -7,7 +7,7 @@ include ${F_STACKPUSH}
 T_DIRNAME :=
 
 
-include ${CURDIR}${G_FILESMK}
+include ${CURDIR}/${G_FILESMK}
 include $(addsuffix /${G_DIRMK},${NEWDIRS})
 
 

diff --git a/lib/src/files.mk b/lib/src/files.mk
index 9b5ad63..bae3e1f 100644 (file)
--- a/lib/src/files.mk
+++ b/lib/src/files.mk
@@ -11,8 +11,8 @@ NEWDIRS += locks
 
 ################################################################################
 
-NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS})
-NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS})
+NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS})
 
 # Append to lists
 

diff --git a/lib/src/locks/dir.mk b/lib/src/locks/dir.mk
index 1abbe1c..42441bc 100644 (file)
--- a/lib/src/locks/dir.mk
+++ b/lib/src/locks/dir.mk
@@ -7,7 +7,7 @@ include ${F_STACKPUSH}
 T_DIRNAME :=
 
 
-include ${CURDIR}${G_FILESMK}
+include ${CURDIR}/${G_FILESMK}
 include $(addsuffix /${G_DIRMK},${NEWDIRS})
 
 

diff --git a/lib/src/locks/files.mk b/lib/src/locks/files.mk
index bbd538c..93bad52 100644 (file)
--- a/lib/src/locks/files.mk
+++ b/lib/src/locks/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/lib/vars.mk b/lib/vars.mk
index 0bc5a81..e019f4e 100644 (file)
--- a/lib/vars.mk
+++ b/lib/vars.mk
@@ -7,7 +7,7 @@ T_DIRNAME := lib
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
 P       := ${P_LIB}
-CURDIR  := ${DIRNAME}/
+CURDIR  := ${DIRNAME}
 
 T_DIRNAME :=
 
@@ -16,13 +16,13 @@ CXX_$P      := ${G_CXX}
 CXXFLAGS_$P := ${G_CXXFLAGS} -fPIC
 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}
 
 
-T_INCDIRS_$P := ${SRCSDIR_$P} ${CURDIR}include/bear/
+T_INCDIRS_$P := ${SRCSDIR_$P} ${CURDIR}/include/bear
     INCFLAGS_$P := $(addprefix -I, ${T_INCDIRS_$P})
 T_INCDIRS_$P :=
 
@@ -39,5 +39,5 @@ endif
 
 LNKFLAGS_$P := ${G_LNKFLAGS} -shared -Wl,-soname,${SONAME_$P}
 
-TARGETTMP_$P   := ${OBJSDIR_$P}${REALNAME_$P}
+TARGETTMP_$P   := ${OBJSDIR_$P}/${REALNAME_$P}
 

diff --git a/targets.mk b/targets.mk
index 2732ee3..4acf1b6 100644 (file)
--- a/targets.mk
+++ b/targets.mk
@@ -10,7 +10,7 @@ G_OBJS_LIB := objs-${G_LIB}
 G_DEPS_LIB := deps-${G_LIB}
 .PHONY: ${G_DEPS_LIB}
 
-TARGET_${G_LIB} := ${BINDIR_${G_LIB}}${REALNAME_${G_LIB}}
+TARGET_${G_LIB} := ${BINDIR_${G_LIB}}/${REALNAME_${G_LIB}}
 
 
 G_TESTS := ${P_TESTS}

diff --git a/tests/dir.mk b/tests/dir.mk
index 1e50bd8..9b0daa8 100644 (file)
--- a/tests/dir.mk
+++ b/tests/dir.mk
@@ -7,19 +7,19 @@ T_DIRNAME := tests
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
 P       := ${P_TESTS}
-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}: | $${@D}
 

diff --git a/tests/rules.mk b/tests/rules.mk
index 5c80769..865de99 100644 (file)
--- a/tests/rules.mk
+++ b/tests/rules.mk
@@ -3,7 +3,7 @@ ${G_OBJS_TESTS}: ${L_OBJS_$P}
 ${G_DEPS_TESTS}: ${L_DEPS_$P}
 
 # how to copy a library to the tests bin directory
-${BINDIR_$P}${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D}
+${BINDIR_$P}/${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D}
        ${cmd-cp}
 
 # rule to make an object file from a .cpp

diff --git a/tests/src/1/dir.mk b/tests/src/1/dir.mk
index 1a122af..249c98b 100644 (file)
--- a/tests/src/1/dir.mk
+++ b/tests/src/1/dir.mk
@@ -7,11 +7,11 @@ include ${F_STACKPUSH}
 T_DIRNAME :=
 
 
-include ${CURDIR}${G_VARSMK}
+include ${CURDIR}/${G_VARSMK}
 
-include ${CURDIR}${G_LISTSMK}
+include ${CURDIR}/${G_LISTSMK}
 
-include ${CURDIR}${G_FILESMK}
+include ${CURDIR}/${G_FILESMK}
 
 include $(addsuffix /${G_DIRMK},${NEWDIRS})
 
@@ -19,9 +19,9 @@ L_SRCS_$P += ${L_SRCS_$D}
 L_OBJS_$P += ${L_OBJS_$D}
 L_DEPS_$P += ${L_DEPS_$D}
 
-include ${CURDIR}${G_TVARSMK}
+include ${CURDIR}/${G_TVARSMK}
 
-include ${CURDIR}${G_RULESMK}
+include ${CURDIR}/${G_RULESMK}
 
 
 include ${F_STACKPOP}

diff --git a/tests/src/1/files.mk b/tests/src/1/files.mk
index 6efe3a9..9f4b80e 100644 (file)
--- a/tests/src/1/files.mk
+++ b/tests/src/1/files.mk
@@ -6,8 +6,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/tests/src/1/rules.mk b/tests/src/1/rules.mk
index 255e0d1..5c8ea92 100644 (file)
--- a/tests/src/1/rules.mk
+++ b/tests/src/1/rules.mk
@@ -3,7 +3,7 @@ ${G_ALL_TESTS}: ${TARGET_$D}
 ${G_TESTS}-${DIRNAME}: ${TARGET_$D}
 
 # this test depends on the G_LIB library
-${TARGETTMP_$D}: ${BINDIR_$P}${SONAME_${G_LIB}}
+${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
 
 # how to link the main target
 ${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D}

diff --git a/tests/src/1/vars.mk b/tests/src/1/vars.mk
index 3e2e1b7..91c3d63 100644 (file)
--- a/tests/src/1/vars.mk
+++ b/tests/src/1/vars.mk
@@ -5,6 +5,6 @@ LNKFLAGS_$D   := ${LNKFLAGS_$P}
 LIBS_$D       := ${LIBS_$P}
 
 TARGETNAME_$D := ${TARGETPRE_$P}${DIRNAME}
-TARGETTMP_$D  := ${OBJSDIR_$P}${TARGETNAME_$D}
-TARGET_$D     := ${BINDIR_$P}${TARGETNAME_$D}
+TARGETTMP_$D  := ${OBJSDIR_$P}/${TARGETNAME_$D}
+TARGET_$D     := ${BINDIR_$P}/${TARGETNAME_$D}
 

diff --git a/tests/src/dir.mk b/tests/src/dir.mk
index 3f7e5ed..c436733 100644 (file)
--- a/tests/src/dir.mk
+++ b/tests/src/dir.mk
@@ -7,7 +7,7 @@ include ${F_STACKPUSH}
 T_DIRNAME :=
 
 
-include ${CURDIR}${G_FILESMK}
+include ${CURDIR}/${G_FILESMK}
 include $(addsuffix /${G_DIRMK},${NEWDIRS})
 
 

diff --git a/tests/src/files.mk b/tests/src/files.mk
index 036338f..2e6e098 100644 (file)
--- a/tests/src/files.mk
+++ b/tests/src/files.mk
@@ -8,8 +8,8 @@ NEWDIRS += printTrace
 
 ################################################################################
 
-NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS})
-NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS})
+NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS})
 
 # Append to lists
 

diff --git a/tests/src/printTrace/dir.mk b/tests/src/printTrace/dir.mk
index 72353ba..515989c 100644 (file)
--- a/tests/src/printTrace/dir.mk
+++ b/tests/src/printTrace/dir.mk
@@ -7,21 +7,21 @@ include ${F_STACKPUSH}
 T_DIRNAME :=
 
 
-include ${CURDIR}${G_VARSMK}
+include ${CURDIR}/${G_VARSMK}
 
-include ${CURDIR}${G_LISTSMK}
+include ${CURDIR}/${G_LISTSMK}
 
-include ${CURDIR}${G_FILESMK}
+include ${CURDIR}/${G_FILESMK}
 
-include $(addsuffix ${G_DIRMK},${NEWDIRS})
+include $(addsuffix /${G_DIRMK},${NEWDIRS})
 
 L_SRCS_$P += ${L_SRCS_$D}
 L_OBJS_$P += ${L_OBJS_$D}
 L_DEPS_$P += ${L_DEPS_$D}
 
-include ${CURDIR}${G_TVARSMK}
+include ${CURDIR}/${G_TVARSMK}
 
-include ${CURDIR}${G_RULESMK}
+include ${CURDIR}/${G_RULESMK}
 
 
 include ${F_STACKPOP}

diff --git a/tests/src/printTrace/files.mk b/tests/src/printTrace/files.mk
index 6efe3a9..9f4b80e 100644 (file)
--- a/tests/src/printTrace/files.mk
+++ b/tests/src/printTrace/files.mk
@@ -6,8 +6,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/tests/src/printTrace/rules.mk b/tests/src/printTrace/rules.mk
index 255e0d1..5c8ea92 100644 (file)
--- a/tests/src/printTrace/rules.mk
+++ b/tests/src/printTrace/rules.mk
@@ -3,7 +3,7 @@ ${G_ALL_TESTS}: ${TARGET_$D}
 ${G_TESTS}-${DIRNAME}: ${TARGET_$D}
 
 # this test depends on the G_LIB library
-${TARGETTMP_$D}: ${BINDIR_$P}${SONAME_${G_LIB}}
+${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
 
 # how to link the main target
 ${TARGETTMP_$D}: ${L_OBJS_$D} | $${@D}

diff --git a/tests/src/printTrace/vars.mk b/tests/src/printTrace/vars.mk
index 3e2e1b7..91c3d63 100644 (file)
--- a/tests/src/printTrace/vars.mk
+++ b/tests/src/printTrace/vars.mk
@@ -5,6 +5,6 @@ LNKFLAGS_$D   := ${LNKFLAGS_$P}
 LIBS_$D       := ${LIBS_$P}
 
 TARGETNAME_$D := ${TARGETPRE_$P}${DIRNAME}
-TARGETTMP_$D  := ${OBJSDIR_$P}${TARGETNAME_$D}
-TARGET_$D     := ${BINDIR_$P}${TARGETNAME_$D}
+TARGETTMP_$D  := ${OBJSDIR_$P}/${TARGETNAME_$D}
+TARGET_$D     := ${BINDIR_$P}/${TARGETNAME_$D}
 

diff --git a/tests/vars.mk b/tests/vars.mk
index 3a08d67..4821e15 100644 (file)
--- a/tests/vars.mk
+++ b/tests/vars.mk
@@ -4,13 +4,13 @@ CXXFLAGS_$P := ${G_CXXFLAGS}
 LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,./ -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 := lib/include/
+T_INCDIRS_$P := lib/include
     INCFLAGS_$P  := $(addprefix -I, ${T_INCDIRS_$P})
 T_INCDIRS_$P := # empty
 

diff --git a/vars.mk b/vars.mk
index 3366a49..4bf1bb2 100644 (file)
--- a/vars.mk
+++ b/vars.mk
@@ -72,20 +72,20 @@ else
     G_LIBSDL  := `sdl-config --libs`
 endif
 
-G_SRCSDIR := src/
-G_DEPSDIR := deps/
+G_SRCSDIR := src
+G_DEPSDIR := deps
 
 ifeq (${G_BUILD},${B_DEBUG})
-    G_OBJSDIR := objsd/
-    G_BINDIR  := bind/
+    G_OBJSDIR := objsd
+    G_BINDIR  := bind
 else
 ifeq (${G_BUILD},${B_FINAL})
-    G_OBJSDIR := objs/
-    G_BINDIR  := bin/
+    G_OBJSDIR := objs
+    G_BINDIR  := bin
 else
 ifeq (${G_BUILD},${B_WIN32})
-    G_OBJSDIR := objs-mingw32/
-    G_BINDIR  := bin-mingw32/
+    G_OBJSDIR := objs-mingw32
+    G_BINDIR  := bin-mingw32
 else
     $(error 'G_BUILD = ${G_BUILD}' is invalid.)
 endif