diff options
| author | Michael Wallner <mike@php.net> | 2015-01-30 17:58:49 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2015-01-30 17:58:49 +0100 |
| commit | fa453d5abd358a1e99e304ba69e7a11059e8f1a0 (patch) | |
| tree | 19ec0fc47f28287093efa9a9476576aab42a9735 | |
| parent | 563e7822fd377706b1a9c764cd9adbfc274fd213 (diff) | |
| download | php-git-fa453d5abd358a1e99e304ba69e7a11059e8f1a0.tar.gz | |
make buildconf actually work
| -rw-r--r-- | build/build.mk | 9 | ||||
| -rw-r--r-- | build/build2.mk | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/build.mk b/build/build.mk index 007f081f19..6e2668287e 100644 --- a/build/build.mk +++ b/build/build.mk @@ -22,17 +22,16 @@ SUBDIRS = Zend TSRM STAMP = buildmk.stamp -ALWAYS = generated_lists - - -all: $(STAMP) $(ALWAYS) +all: $(STAMP) generated_lists @$(MAKE) -s -f build/build2.mk -generated_lists: +generated_lists: ALWAYS @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \ Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ +ALWAYS: + $(STAMP): build/buildcheck.sh @build/buildcheck.sh $(STAMP) diff --git a/build/build2.mk b/build/build2.mk index 2d9e684ec0..08f144f8b6 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -50,5 +50,6 @@ aclocal.m4: configure.in acinclude.m4 configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ + @rm -f $@ $(PHP_AUTOCONF) $(SUPPRESS_WARNINGS) |