From 52ea3ab0fc85181a1c74af3e384e9b07fdb425d5 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Wed, 1 Jul 2009 15:30:08 -0400 Subject: [PATCH] created function include varibles F_ --- Makefile | 2 ++ Makefile.d/vars.mk | 6 ++++++ lib/rules.mk | 2 +- lib/src/dir.mk | 4 ++-- lib/src/locks/dir.mk | 4 ++-- tests/rules.mk | 2 +- tests/src/1/dir.mk | 4 ++-- tests/src/dir.mk | 4 ++-- tests/src/printTrace/dir.mk | 4 ++-- 9 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 Makefile.d/vars.mk diff --git a/Makefile b/Makefile index a1a2d5c..5510278 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,8 @@ G_RULESMK := rules.mk G_LISTSMK := lists.mk G_TVARSMK := tvars.mk +include Makefile.d/${G_VARSMK} + include ${G_LISTSMK} include ${G_VARSMK} diff --git a/Makefile.d/vars.mk b/Makefile.d/vars.mk new file mode 100644 index 0000000..64ac7d7 --- /dev/null +++ b/Makefile.d/vars.mk @@ -0,0 +1,6 @@ + +F_STACKPUSH := Makefile.d/stackpush.mk +F_STACKPOP := Makefile.d/stackpop.mk + +F_CLEANRULES := Makefile.d/cleanrules.mk + diff --git a/lib/rules.mk b/lib/rules.mk index 2b50788..ea75bc9 100644 --- a/lib/rules.mk +++ b/lib/rules.mk @@ -38,6 +38,6 @@ ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} T := $P - include Makefile.d/cleanrules.mk + include ${F_CLEANRULES} T := diff --git a/lib/src/dir.mk b/lib/src/dir.mk index b18fdc0..165ec69 100644 --- a/lib/src/dir.mk +++ b/lib/src/dir.mk @@ -3,7 +3,7 @@ T_DIRNAME := src ################################################################################ -include Makefile.d/stackpush.mk +include ${F_STACKPUSH} T_DIRNAME := @@ -11,5 +11,5 @@ include ${CURDIR}${G_FILESMK} include $(addsuffix ${G_DIRMK},${NEWDIRS}) -include Makefile.d/stackpop.mk +include ${F_STACKPOP} diff --git a/lib/src/locks/dir.mk b/lib/src/locks/dir.mk index 56bd062..d7a1a38 100644 --- a/lib/src/locks/dir.mk +++ b/lib/src/locks/dir.mk @@ -3,7 +3,7 @@ T_DIRNAME := locks ################################################################################ -include Makefile.d/stackpush.mk +include ${F_STACKPUSH} T_DIRNAME := @@ -11,5 +11,5 @@ include ${CURDIR}${G_FILESMK} include $(addsuffix ${G_DIRMK},${NEWDIRS}) -include Makefile.d/stackpop.mk +include ${F_STACKPOP} diff --git a/tests/rules.mk b/tests/rules.mk index 9639031..5c80769 100644 --- a/tests/rules.mk +++ b/tests/rules.mk @@ -16,6 +16,6 @@ ${DEPSDIR_$P}%.d: ${SRCSDIR_$P}%.cpp | $${@D} T := $P - include Makefile.d/cleanrules.mk + include ${F_CLEANRULES} T := diff --git a/tests/src/1/dir.mk b/tests/src/1/dir.mk index 9989045..4cc65c6 100644 --- a/tests/src/1/dir.mk +++ b/tests/src/1/dir.mk @@ -3,7 +3,7 @@ T_DIRNAME := 1 ################################################################################ -include Makefile.d/stackpush.mk +include ${F_STACKPUSH} T_DIRNAME := @@ -24,5 +24,5 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} -include Makefile.d/stackpop.mk +include ${F_STACKPOP} diff --git a/tests/src/dir.mk b/tests/src/dir.mk index b18fdc0..165ec69 100644 --- a/tests/src/dir.mk +++ b/tests/src/dir.mk @@ -3,7 +3,7 @@ T_DIRNAME := src ################################################################################ -include Makefile.d/stackpush.mk +include ${F_STACKPUSH} T_DIRNAME := @@ -11,5 +11,5 @@ include ${CURDIR}${G_FILESMK} include $(addsuffix ${G_DIRMK},${NEWDIRS}) -include Makefile.d/stackpop.mk +include ${F_STACKPOP} diff --git a/tests/src/printTrace/dir.mk b/tests/src/printTrace/dir.mk index 4a25699..72353ba 100644 --- a/tests/src/printTrace/dir.mk +++ b/tests/src/printTrace/dir.mk @@ -3,7 +3,7 @@ T_DIRNAME := printTrace ################################################################################ -include Makefile.d/stackpush.mk +include ${F_STACKPUSH} T_DIRNAME := @@ -24,5 +24,5 @@ include ${CURDIR}${G_TVARSMK} include ${CURDIR}${G_RULESMK} -include Makefile.d/stackpop.mk +include ${F_STACKPOP} -- 2.10.2