summaryrefslogtreecommitdiff
path: root/buildconf
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-04-13 15:53:20 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-04-16 17:25:08 +0200
commitb09fa9ed530df47bff03b151931fa4464a388d35 (patch)
treeff62b68b44d7298d6915d2ff55f0a3b628b6d69f /buildconf
parent12ee246ae45889004fc2c099c04cfff1ce6e8848 (diff)
downloadphp-git-b09fa9ed530df47bff03b151931fa4464a388d35.tar.gz
Simplify generated_lists generation
The `generated_lists` file is generated as a helper for build related Makefile to include a list of *.m4 files prerequisites. When some of these *.m4 files change, the configure script is regenerated when buildconf is run. This can be simplified using dynamic environment variable passed to the Makefile directly so it avoids another file from being generated in the project root directory and shipping it with the PHP release or creating a dedicated gitignore rule. This is portable across all POSIX compatible makes So this patch includes GNU Make, and everybody elses' make derivative support.
Diffstat (limited to 'buildconf')
-rwxr-xr-xbuildconf7
1 files changed, 4 insertions, 3 deletions
diff --git a/buildconf b/buildconf
index ad9febfef5..2b2f8f696a 100755
--- a/buildconf
+++ b/buildconf
@@ -91,10 +91,11 @@ fi
echo "buildconf: Building configure files"
-rm -f generated_lists
+# List of *.m4 prerequisites files for the make configure target.
+M4_FILES=$(echo TSRM/*.m4 Zend/*.m4 ext/*/config*.m4 sapi/*/config*.m4)
if test "$debug" = "1"; then
- $MAKE -s -f build/build.mk SUPPRESS_WARNINGS=""
+ $MAKE -s -f build/build.mk M4_FILES="$M4_FILES" SUPPRESS_WARNINGS=""
else
- $MAKE -s -f build/build.mk
+ $MAKE -s -f build/build.mk M4_FILES="$M4_FILES"
fi