From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 9 Jun 2014 08:06:29 +0000 (+0200)
Subject: Merge sapi/phpdbg into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~215^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6adc30028cfd04a1c6bcb0866de2fb22dae49ef5;p=php

Merge sapi/phpdbg into PHP-5.6
---

6adc30028cfd04a1c6bcb0866de2fb22dae49ef5
diff --cc sapi/phpdbg/.gitignore
index 5506a2652d,0000000000..51165dab2f
mode 100644,000000..100644
--- a/sapi/phpdbg/.gitignore
+++ b/sapi/phpdbg/.gitignore
@@@ -1,5 -1,0 +1,6 @@@
 +.libs/
 +phpdbg
 +*.lo
 +*.o
++*.output
 +build
diff --cc sapi/phpdbg/Makefile.frag
index 45768de2ef,0000000000..d787b0fb18
mode 100644,000000..100644
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@@ -1,36 -1,0 +1,39 @@@
 +phpdbg: $(BUILD_BINARY)
 +
 +phpdbg-shared: $(BUILD_SHARED)
 +
 +$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +	$(BUILD_PHPDBG_SHARED)
 +
 +$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +	$(BUILD_PHPDBG)
 +
- $(builddir)/sapi/phpdbg/phpdbg_lexer.lo: $(srcdir)/sapi/phpdbg/phpdbg_parser.h
++%.c: %.y
++%.c: %.l
 +
- $(srcdir)/sapi/phpdbg/phpdbg_lexer.c: $(srcdir)/sapi/phpdbg/phpdbg_lexer.l
- 	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
++$(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 +
- $(srcdir)/sapi/phpdbg/phpdbg_parser.h: $(srcdir)/sapi/phpdbg/phpdbg_parser.c
- $(srcdir)/sapi/phpdbg/phpdbg_parser.c: $(srcdir)/sapi/phpdbg/phpdbg_parser.y
- 	@$(YACC) -p phpdbg_ -v -d $(srcdir)/sapi/phpdbg/phpdbg_parser.y -o $@
++$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
++	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo $(srcdir)/phpdbg_lexer.c $(srcdir)/phpdbg_lexer.l)
++
++$(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
++$(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y
++	@$(YACC) -p phpdbg_ -v -d $(srcdir)/phpdbg_parser.y -o $@
 +
 +install-phpdbg: $(BUILD_BINARY)
 +	@echo "Installing phpdbg binary:         $(INSTALL_ROOT)$(bindir)/"
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
 +	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
 +
 +clean-phpdbg:
 +	@echo "Cleaning phpdbg object files ..."
 +	find sapi/phpdbg/ -name *.lo -o -name *.o | xargs rm -f
 +
 +test-phpdbg:
 +	@echo "Running phpdbg tests ..."
 +	@$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg
 +
 +.PHONY: clean-phpdbg test-phpdbg
 +