diff options
| author | Marcus Boerger <helly@php.net> | 2008-02-17 20:50:03 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-02-17 20:50:03 +0000 |
| commit | 2633dcab4648bb8120096a29fa291237510d4808 (patch) | |
| tree | dc18e7fd14459191ef7c4889e5e854604f2bd051 /Makefile.global | |
| parent | 22392affefd36c47876f23157e7539e51fea6805 (diff) | |
| download | php-git-2633dcab4648bb8120096a29fa291237510d4808.tar.gz | |
- MFH Allow zend_extensions to be build inside ext and tested with 'make test'
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index b4cec63319..0cbfac4925 100644 --- a/Makefile.global +++ b/Makefile.global @@ -11,7 +11,7 @@ all: $(all_targets) @echo "Don't forget to run 'make test'." @echo -build-modules: $(PHP_MODULES) +build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ @@ -73,6 +73,11 @@ PHP_TEST_SHARED_EXTENSIONS = ` \ for i in $(PHP_MODULES)""; do \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ done; \ + fi; \ + if test "x$(PHP_ZEND_EX)" != "x"; then \ + for i in $(PHP_ZEND_EX)""; do \ + . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ + done; \ fi` test: all @@ -84,7 +89,7 @@ test: all elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ if test "$$INI_FILE"; then \ - $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ else \ echo > $(top_builddir)/tmp-php.ini; \ fi; \ |