Revert "Remove some unnecessary explicit header dependencies"

This reverts commit c386b1fb177ec0dccc840cbec801e69609ced5c3.

It looks like at least some of these might be needed for ordering
in a clean build?

diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag
index 44f33c942834ab059f7ba411eb0ef41bc856c7e3..1e5023b2042e8b409c31ba0de604cb5e2999cc9d 100644 (file)
--- a/Zend/Makefile.frag
+++ b/Zend/Makefile.frag
@@ -2,6 +2,9 @@
 # Zend
 #
 
+$(builddir)/zend_language_scanner.lo: $(srcdir)/zend_language_parser.h
+$(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
+
 $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
        @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
 
@@ -33,3 +36,7 @@ $(srcdir)/zend_vm_execute.h: $(srcdir)/zend_vm_def.h $(srcdir)/zend_vm_execute.s
        @if test ! -z "$(PHP)" && test -x "$(PHP)"; then \
                $(PHP) $(srcdir)/zend_vm_gen.php; \
        fi;
+
+$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
+
+Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h $(srcdir)/zend_vm_opcodes.h

diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index 6f4659d8cbfadbe05b573e24399b5aa949180472..16d8a202854260ee9221c12085da826f8c53035e 100644 (file)
--- a/ext/standard/Makefile.frag
+++ b/ext/standard/Makefile.frag
@@ -5,3 +5,5 @@ $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re
        @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c      ext/standard/url_scanner_ex.re)
 
 $(builddir)/info.lo: $(builddir)/../../main/build-defs.h
+
+$(builddir)/basic_functions.lo: $(top_srcdir)/Zend/zend_language_parser.h