build: shortened J_COMPILER_DEPEND_FLAGS to J_DEPEND_FLAGS

jafl · May 23, 2024 · acebb80 · acebb80
1 parent 9f87285
commit acebb80
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 19 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,11 @@ the include file directories.
 Changes to the build system
 ===========================
 
+4.2.0
+-----
+
+* Shortened J_COMPILER_DEPEND_FLAGS to J_DEPEND_FLAGS
+
 4.0.0
 -----
 

diff --git a/include/jx-af/make/jx_config_common b/include/jx-af/make/jx_config_common
@@ -15,13 +15,13 @@ else
   J_OPTIMIZE_LEVEL := -O${J_DEBUG_OPTIMIZATION_LEVEL} -g
 endif
 
-J_COMPILER_DEPEND_FLAGS_FOR_BISON = ${J_RAW_SYSTEM_STUFF}
+J_DEPEND_FLAGS_FOR_BISON = ${J_RAW_SYSTEM_STUFF}
 
-J_COMPILER_DEPEND_FLAGS = \
-  -Wall -Werror ${J_COMPILER_DEPEND_FLAGS_FOR_BISON}
+J_DEPEND_FLAGS = \
+  -Wall -Werror ${J_DEPEND_FLAGS_FOR_BISON}
 
 ifdef SNAPCRAFT_BUILD_ENVIRONMENT
-  J_COMPILER_DEPEND_FLAGS += -D_J_EVERGREEN_INSTALL
+  J_DEPEND_FLAGS += -D_J_EVERGREEN_INSTALL
 endif
 
 J_GCC_LIBS := -lxml2 ${J_GCC_LIBS}

diff --git a/libj2dplot/Make.header b/libj2dplot/Make.header
@@ -8,7 +8,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/libj2dplot/testui/Make.header b/libj2dplot/testui/Make.header
@@ -14,7 +14,7 @@ SEARCHDIRS := -I./code ${SEARCHDIRS}
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} -g ${SEARCHDIRS}
+DEPENDFLAGS := ${J_DEPEND_FLAGS} -g ${SEARCHDIRS}
 
 # library dependencies
 

diff --git a/libjcore/Make.header b/libjcore/Make.header
@@ -10,7 +10,7 @@ SEARCHDIRS += ${shell xml2-config --cflags}
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/libjexpr/Make.header b/libjexpr/Make.header
@@ -8,7 +8,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/libjfs/Make.header b/libjfs/Make.header
@@ -8,7 +8,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/libjx/Make.header b/libjx/Make.header
@@ -10,7 +10,7 @@ SEARCHDIRS := -I./image-build -I./cursor -I./cursor-mask ${SEARCHDIRS}
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/libjx/testui/Make.header b/libjx/testui/Make.header
@@ -18,7 +18,7 @@ SEARCHDIRS := -I./code ${SEARCHDIRS}
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} -g ${SEARCHDIRS}
+DEPENDFLAGS := ${J_DEPEND_FLAGS} -g ${SEARCHDIRS}
 
 # library dependencies
 

diff --git a/tools/compile_jstrings/Make.header b/tools/compile_jstrings/Make.header
@@ -10,7 +10,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 # library dependencies - do not invoke default behavior in app_targets
 

diff --git a/tools/jx_layout_editor/Make.header b/tools/jx_layout_editor/Make.header
@@ -28,7 +28,7 @@ endif
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS} \
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS} \
                -DJX_INCLUDE_PATH=\"${JX_INCLUDE_PATH}\" \
                -DCODE_CRUSADER_BINARY=\"${CODE_CRUSADER_BINARY}\"
 

diff --git a/tools/jx_memory_debugger/Make.header b/tools/jx_memory_debugger/Make.header
@@ -12,7 +12,7 @@ SEARCHDIRS := -I./code -I./image-build ${SEARCHDIRS}
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 # library dependencies
 

diff --git a/tools/jx_menu_editor/Make.header b/tools/jx_menu_editor/Make.header
@@ -22,7 +22,7 @@ endif
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS} \
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS} \
                -DJX_INCLUDE_PATH=\"${JX_INCLUDE_PATH}\"
 
 # library dependencies

diff --git a/tools/jx_project_wizard/Make.header b/tools/jx_project_wizard/Make.header
@@ -25,7 +25,7 @@ endif
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS} \
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS} \
                -DJX_PATH=\"${JX_PATH}\" \
                -DTEMPLATE_ROOT=\"${APP_DATA_FILE_DIR}\"
 

diff --git a/tools/jx_project_wizard/app_template/Make.header b/tools/jx_project_wizard/app_template/Make.header
@@ -12,7 +12,7 @@ SEARCHDIRS := -I./code -I./image-build ${SEARCHDIRS}
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS} <MDI_DEF>
+DEPENDFLAGS := ${J_DEPEND_FLAGS} ${SEARCHDIRS} <MDI_DEF>
 
 # library dependencies
 

diff --git a/tools/jx_project_wizard/lib_template/Make.header b/tools/jx_project_wizard/lib_template/Make.header
@@ -8,7 +8,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS = ${J_COMPILER_DEPEND_FLAGS} ${SEARCHDIRS}
+DEPENDFLAGS = ${J_DEPEND_FLAGS} ${SEARCHDIRS}
 
 #####
 

diff --git a/tutorial/Make.header b/tutorial/Make.header
@@ -23,7 +23,7 @@ include ${MAKE_INCLUDE}/jx_config
 
 # makemake variables
 
-DEPENDFLAGS := ${J_COMPILER_DEPEND_FLAGS} -g ${SEARCHDIRS}
+DEPENDFLAGS := ${J_DEPEND_FLAGS} -g ${SEARCHDIRS}
 
 # library dependencies