diff options
| -rw-r--r-- | Makefile.frag | 22 | ||||
| -rw-r--r-- | Zend/Makefile.frag | 23 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | genfiles | 2 |
4 files changed, 24 insertions, 24 deletions
diff --git a/Makefile.frag b/Makefile.frag deleted file mode 100644 index 7c65cfab3c..0000000000 --- a/Makefile.frag +++ /dev/null @@ -1,22 +0,0 @@ -# -# 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) - -$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c -$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y - @$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@ - -$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c -$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y - @$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@ - -$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l - @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l) - -$(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag index 3ab617d715..cca9c2c697 100644 --- a/Zend/Makefile.frag +++ b/Zend/Makefile.frag @@ -1 +1,24 @@ +# +# 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) + +$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c +$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y + @$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@ + +$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c +$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y + @$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@ + +$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l) + +$(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/configure.ac b/configure.ac index a5f335e8ec..46a6975318 100644 --- a/configure.ac +++ b/configure.ac @@ -1535,7 +1535,6 @@ PHP_ADD_BUILD_DIR(TSRM) PHP_ADD_BUILD_DIR(Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts) -PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend) PHP_GEN_BUILD_DIRS @@ -9,7 +9,7 @@ if [ -z $RE2C ]; then RE2C="re2c" fi -STD="make -f Makefile.frag RE2C='$RE2C' RE2C_FLAGS='-i' YACC='$YACC' srcdir=Zend builddir=Zend top_srcdir=." +STD="make -f Zend/Makefile.frag RE2C='$RE2C' RE2C_FLAGS='-i' YACC='$YACC' srcdir=Zend builddir=Zend top_srcdir=." (eval "$STD Zend/zend_language_parser.c Zend/zend_language_scanner.c Zend/zend_ini_parser.c Zend/zend_ini_scanner.c") |