create a common makefile for D, P, Q, SQ macros

adoptium · Apr 28, 2021 · 69fba39 · 69fba39
1 parent b0ecff6
commit 69fba39
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/clean.mk b/clean.mk
@@ -14,12 +14,12 @@
 
 .DEFAULT_GOAL := clean
 
-include common.mk
 
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
 endif
 
+include $(TEST_ROOT)/TKG/common.mk
 include settings.mk
 
 cleanBuild:

diff --git a/compile.mk b/compile.mk
@@ -14,12 +14,11 @@
 
 .DEFAULT_GOAL := compile
 
-include common.mk
-
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
 endif
 
+include $(TEST_ROOT)/TKG/common.mk
 include settings.mk
 include moveDmp.mk
 

diff --git a/makeGen.mk b/makeGen.mk
@@ -23,7 +23,6 @@ help:
 CURRENT_DIR := $(shell pwd)
 OPTS=
 
-include common.mk
 
 TKG_JAR = .$(D)bin$(D)TestKitGen.jar
 JSON_SIMPLE = .$(D)lib$(D)json-simple.jar
@@ -32,6 +31,12 @@ ifneq (,$(findstring Win,$(OS)))
 CURRENT_DIR := $(subst \,/,$(CURRENT_DIR))
 P=;
 endif
+
+ifndef TEST_ROOT
+	TEST_ROOT := $(shell pwd)$(D)..
+endif
+
+include $(TEST_ROOT)/TKG/common.mk
 include $(CURRENT_DIR)$(D)featureSettings.mk
 -include $(CURRENT_DIR)$(D)autoGenEnv.mk
 include $(CURRENT_DIR)$(D)envSettings.mk

diff --git a/moveDmp.mk b/moveDmp.mk
@@ -12,12 +12,12 @@
 # limitations under the License.
 ##############################################################################
 
-include common.mk
-
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
 endif
 
+include $(TEST_ROOT)/TKG/common.mk
+
 COMPILATION_OUTPUT=$(TEST_ROOT)$(D)TKG$(D)output_compilation
 COMPILATION_LOG=$(COMPILATION_OUTPUT)$(D)compilation.log
 MOVE_TDUMP_PERL=perl scripts$(D)moveDmp.pl --compileLogPath=$(Q)$(COMPILATION_LOG)$(Q) --testRoot=$(Q)$(TEST_ROOT)$(Q)

diff --git a/runtest.mk b/runtest.mk
@@ -18,12 +18,12 @@
 
 .DEFAULT_GOAL := test
 
-include common.mk
 
 SUBDIRS = ..
 
 ifndef TEST_ROOT
 	TEST_ROOT := $(shell pwd)$(D)..
 endif
 
+include $(TEST_ROOT)/TKG/common.mk
 include settings.mk
diff --git a/settings.mk b/settings.mk
@@ -39,8 +39,11 @@ AND_IF_SUCCESS=&&
 PROPS_DIR=props_unix
 TOTALCOUNT := 0
 
-include common.mk
+ifndef TEST_ROOT
+	TEST_ROOT := $(shell pwd)$(D)..
+endif
 
+include $(TEST_ROOT)/TKG/common.mk
 -include $(TEST_ROOT)$(D)TKG$(D)autoGenEnv.mk
 include $(TEST_ROOT)$(D)TKG$(D)envSettings.mk
 -include $(TEST_ROOT)$(D)TKG$(D)utils.mk