makefile: add config-post.mk to augment/alter makefile variables before build rules

jayrm · jayrm · commit 561a9b7047a6 · 2021-07-05T21:16:33.000-04:00
(cherry picked from commit 0e37087)
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@
 /lib/freebasic/*
 /lib64/freebasic/*
 /config.mk
+/config-post.mk
 
 /doc/fbdoc/fbdoc
 /doc/makefbhelp/makefbhelp
diff --git a/makefile b/makefile
@@ -108,7 +108,11 @@
 #   -DDISABLE_D3D10  build without DirectX 10 driver(disable D2D driver in windows)
 #
 # makefile variables may either be set on the make command line,
-# or (in a more permanent way) inside a 'config.mk' file.
+# or (in a more permanent way) inside a 'config.mk' file before
+# the makefile variable set-up is evaluated.  makefile variables
+# already defined in this makefile can also be augmented / modified
+# inside a 'config-post.mk' file which is included after all the
+# variable set-up, but before the build rules.
 #
 # The makefile searches the sources based on its location, but builds into
 # the current directory. It's possible to build in a separate directory by
@@ -566,6 +570,9 @@ ifeq ($(TARGET_OS),js)
   RTL_LIBS += $(libdir)/fb_shell.html
 endif
 
+# allow optionally including config-post
+-include config-post.mk
+
 #
 # Build rules
 #

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,11 @@`
`108`	`108`	`# -DDISABLE_D3D10 build without DirectX 10 driver(disable D2D driver in windows)`
`109`	`109`	`#`
`110`	`110`	`# makefile variables may either be set on the make command line,`
`111`		`-# or (in a more permanent way) inside a 'config.mk' file.`
	`111`	`+# or (in a more permanent way) inside a 'config.mk' file before`
	`112`	`+# the makefile variable set-up is evaluated. makefile variables`
	`113`	`+# already defined in this makefile can also be augmented / modified`
	`114`	`+# inside a 'config-post.mk' file which is included after all the`
	`115`	`+# variable set-up, but before the build rules.`
`112`	`116`	`#`
`113`	`117`	`# The makefile searches the sources based on its location, but builds into`
`114`	`118`	`# the current directory. It's possible to build in a separate directory by`
`@@ -566,6 +570,9 @@ ifeq ($(TARGET_OS),js)`
`566`	`570`	`RTL_LIBS += $(libdir)/fb_shell.html`
`567`	`571`	`endif`
`568`	`572`
	`573`	`+# allow optionally including config-post`
	`574`	`+-include config-post.mk`
	`575`	`+`
`569`	`576`	`#`
`570`	`577`	`# Build rules`
`571`	`578`	`#`