change some make varibles to be lower case and hence tied to the directory name

diff --git a/lib/dir.mk b/lib/dir.mk
index 3c98bfa..f11bbb1 100644 (file)
--- a/lib/dir.mk
+++ b/lib/dir.mk
@@ -6,7 +6,7 @@ T_DIRNAME := lib
 # top define
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
-P       := ${P_LIB}
+P       := ${P_$D}
 CURDIR  := ${DIRNAME}
 
 T_DIRNAME :=

diff --git a/lib/rules.mk b/lib/rules.mk
index 66dfd21..72749f9 100644 (file)
--- a/lib/rules.mk
+++ b/lib/rules.mk
@@ -15,9 +15,9 @@ uninstall:
        rm /usr/lib/${SONAME}
 
 
-${G_ALL_LIB}: ${TARGET_$P}
-${G_OBJS_LIB}: ${L_OBJS_$P}
-${G_DEPS_LIB}: ${L_DEPS_$P}
+${G_ALL_$P}:  ${TARGET_$P}
+${G_OBJS_$P}: ${L_OBJS_$P}
+${G_DEPS_$P}: ${L_DEPS_$P}
 
 
 # how to link the main target

diff --git a/lib/vars.mk b/lib/vars.mk
index 78e26e5..d5b01aa 100644 (file)
--- a/lib/vars.mk
+++ b/lib/vars.mk
@@ -6,7 +6,7 @@ T_DIRNAME := lib
 # top define
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
-P       := ${P_LIB}
+P       := ${P_$D}
 CURDIR  := ${DIRNAME}
 
 T_DIRNAME :=

diff --git a/packages.mk b/packages.mk
index c6bceff..cad8cf5 100644 (file)
--- a/packages.mk
+++ b/packages.mk
@@ -1,5 +1,5 @@
 
-P_LIB     := lib
-P_TESTS   := tests
-P_PHYSICS := physics
+P_lib     := lib
+P_tests   := tests
+P_physics := physics
 

diff --git a/physics/rules.mk b/physics/rules.mk
index 5a5eb5b..52259b0 100644 (file)
--- a/physics/rules.mk
+++ b/physics/rules.mk
@@ -1,14 +1,14 @@
 
-${G_ALL_PHYSICS}: ${TARGET_$P} ${CFGS_$P} ${LIBSTXT_$P} ${LIBSCPY_$P} ${TXT_$P}
-${G_OBJS_PHYSICS}: ${L_OBJS_$P}
-${G_DEPS_PHYSICS}: ${L_DEPS_$P}
+${G_ALL_$P}:  ${TARGET_$P} ${CFGS_$P} ${LIBSTXT_$P} ${LIBSCPY_$P} ${TXT_$P}
+${G_OBJS_$P}: ${L_OBJS_$P}
+${G_DEPS_$P}: ${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}} | $${SS_DIR}
+${BINDIR_$P}/${LIBSDIRNAME_$P}/${SONAME_${G_lib}}: ${TARGET_${G_lib}} | $${SS_DIR}
        ${cmd-cp}
 
 # how to link the main target

diff --git a/targets.mk b/targets.mk
index 0246986..005dff5 100644 (file)
--- a/targets.mk
+++ b/targets.mk
@@ -1,40 +1,40 @@
 
-G_LIB := ${P_LIB}
+G_lib := ${P_lib}
 
-G_ALL_LIB := all-${G_LIB}
-.PHONY: ${G_ALL_LIB}
+G_ALL_lib := all-${G_lib}
+.PHONY: ${G_ALL_lib}
 
-G_OBJS_LIB := objs-${G_LIB}
-.PHONY: ${G_OBJS_LIB}
+G_OBJS_lib := objs-${G_lib}
+.PHONY: ${G_OBJS_lib}
 
-G_DEPS_LIB := deps-${G_LIB}
-.PHONY: ${G_DEPS_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}
+G_tests := ${P_tests}
 
-G_ALL_TESTS := all-${G_TESTS}
-.PHONY: ${G_ALL_TESTS}
+G_ALL_tests := all-${G_tests}
+.PHONY: ${G_ALL_tests}
 
-G_OBJS_TESTS := objs-${G_TESTS}
-.PHONY: ${G_OBJS_TESTS}
+G_OBJS_tests := objs-${G_tests}
+.PHONY: ${G_OBJS_tests}
 
-G_DEPS_TESTS := deps-${G_TESTS}
-.PHONY: ${G_DEPS_TESTS}
+G_DEPS_tests := deps-${G_tests}
+.PHONY: ${G_DEPS_tests}
 
 
-G_PHYSICS := ${P_PHYSICS}
+G_physics := ${P_physics}
 
-G_ALL_PHYSICS := all-${G_PHYSICS}
-.PHONY: ${G_ALL_PHYSICS}
+G_ALL_physics := all-${G_physics}
+.PHONY: ${G_ALL_physics}
 
-G_OBJS_PHYSICS := objs-${G_PHYSICS}
-.PHONY: ${G_OBJS_PHYSICS}
+G_OBJS_physics := objs-${G_physics}
+.PHONY: ${G_OBJS_physics}
 
-G_DEPS_PHYSICS := deps-${G_PHYSICS}
-.PHONY: ${G_DEPS_PHYSICS}
+G_DEPS_physics := deps-${G_physics}
+.PHONY: ${G_DEPS_physics}
 
 
 .PHONY:         cleanbin
@@ -50,14 +50,14 @@ cleandeps:
 clean: cleanbin cleanobjs cleandeps
 
 
-default: ${G_ALL_LIB}
+default: ${G_ALL_lib}
 
 .PHONY: all
-all: ${G_ALL_LIB} ${G_ALL_TESTS} ${G_ALL_PHYSICS}
+all: ${G_ALL_lib} ${G_ALL_tests} ${G_ALL_physics}
 
 .PHONY: objs
-objs: ${G_OBJS_LIB} ${G_OBJS_TESTS} ${G_OBJS_PHYSICS}
+objs: ${G_OBJS_lib} ${G_OBJS_tests} ${G_OBJS_physics}
 
 .PHONY: deps
-deps: ${G_DEPS_LIB} ${G_DEPS_TESTS} ${G_DEPS_PHYSICS}
+deps: ${G_DEPS_lib} ${G_DEPS_tests} ${G_DEPS_physics}
 

diff --git a/tests/dir.mk b/tests/dir.mk
index eb5e629..3ef428e 100644 (file)
--- a/tests/dir.mk
+++ b/tests/dir.mk
@@ -6,7 +6,7 @@ T_DIRNAME := tests
 # top define
 DIRNAME := ${T_DIRNAME}
 D       := ${DIRNAME}
-P       := ${P_TESTS}
+P       := ${P_$D}
 CURDIR  := ${DIRNAME}
 
 T_DIRNAME :=

diff --git a/tests/rules.mk b/tests/rules.mk
index a78b44e..d326574 100644 (file)
--- a/tests/rules.mk
+++ b/tests/rules.mk
@@ -1,9 +1,9 @@
 
-${G_OBJS_TESTS}: ${L_OBJS_$P}
-${G_DEPS_TESTS}: ${L_DEPS_$P}
+${G_OBJS_$P}: ${L_OBJS_$P}
+${G_DEPS_$P}: ${L_DEPS_$P}
 
 # how to copy a library to the tests bin directory
-${BINDIR_$P}/${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${SS_DIR}
+${BINDIR_$P}/${SONAME_${G_lib}}: ${TARGET_${G_lib}} | $${SS_DIR}
        ${cmd-cp}
 
 # rule to make an object file from a .cpp

diff --git a/tests/src/1/rules.mk b/tests/src/1/rules.mk
index 57203c5..f5de8dc 100644 (file)
--- a/tests/src/1/rules.mk
+++ b/tests/src/1/rules.mk
@@ -1,9 +1,9 @@
 
-${G_ALL_TESTS}: ${TARGET_$D}
-${G_TESTS}-${DIRNAME}: ${TARGET_$D}
+${G_ALL_$P}: ${TARGET_$D}
+${G_$P}-${DIRNAME}: ${TARGET_$D}
 
-# this test depends on the G_LIB library
-${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
+# this test depends on the G_lib library
+${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_lib}}
 
 # how to link the main target
 ${TARGETTMP_$D}: ${L_OBJS_$D} | $${SS_DIR}

diff --git a/tests/src/printTrace/rules.mk b/tests/src/printTrace/rules.mk
index 57203c5..f5de8dc 100644 (file)
--- a/tests/src/printTrace/rules.mk
+++ b/tests/src/printTrace/rules.mk
@@ -1,9 +1,9 @@
 
-${G_ALL_TESTS}: ${TARGET_$D}
-${G_TESTS}-${DIRNAME}: ${TARGET_$D}
+${G_ALL_$P}: ${TARGET_$D}
+${G_$P}-${DIRNAME}: ${TARGET_$D}
 
-# this test depends on the G_LIB library
-${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_LIB}}
+# this test depends on the G_lib library
+${TARGETTMP_$D}: ${BINDIR_$P}/${SONAME_${G_lib}}
 
 # how to link the main target
 ${TARGETTMP_$D}: ${L_OBJS_$D} | $${SS_DIR}