Skip to content

Simplify generated_lists generation #4025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Simplify generated_lists generation #4025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38c3c70
Simplify generated_lists generation
petk Apr 13, 2019
b056c53
GNU Make 3.x something also now works
petk Apr 14, 2019
b9ea20f
Works in GNU Make and everybody else's make derivative
petk Apr 15, 2019
500f54b
Generate list of M4 files in the buildconf script - most portable pro…
petk Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ configure
confdefs.h
conftest*

# Generated by `./buildconf` script as a helper for further build/build2.mk file
/generated_lists

# Generated by configure scripts on all systems
/main/internal_functions.c
/main/internal_functions_cli.c
Expand Down
11 changes: 2 additions & 9 deletions build/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,9 @@ SUBDIRS = Zend TSRM

STAMP = buildmk.stamp

ALWAYS = generated_lists


all: $(STAMP) $(ALWAYS)
all: $(STAMP)
@$(MAKE) -s -f build/build2.mk

generated_lists:
@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@

$(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)

Expand Down Expand Up @@ -64,4 +57,4 @@ gitclean-work:
fi; \
git clean -X -f -d;

.PHONY: $(ALWAYS) snapshot
.PHONY: snapshot
4 changes: 1 addition & 3 deletions build/build2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# | Author: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+

include generated_lists

config_h_in = main/php_config.h.in

targets = configure $(config_h_in)
Expand All @@ -40,7 +38,7 @@ aclocal.m4: configure.ac acinclude.m4
@echo rebuilding $@
cat acinclude.m4 ./build/libtool.m4 > $@

configure: aclocal.m4 configure.ac $(config_m4_files)
configure: aclocal.m4 configure.ac $(M4_FILES)
@echo rebuilding $@
@rm -f $@
$(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS)
6 changes: 3 additions & 3 deletions buildconf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ fi

echo "buildconf: Building configure files"

rm -f generated_lists
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 SUPPRESS_WARNINGS="" M4_FILES="$M4_FILES"
else
$MAKE -s -f build/build.mk
$MAKE -s -f build/build.mk M4_FILES="$M4_FILES"
fi