com php-src: Merge branch 'PHP-7.2': Makefile.global

From: Date: Mon, 25 Sep 2017 19:59:09 +0000
Subject: com php-src: Merge branch 'PHP-7.2': Makefile.global
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99535@lists.php.net to get a copy of this message
Commit: 8cc0921846c2e6c8f2d47d0039d81c28b2643a1e Author: Anatol Belski <ab@php.net> Mon, 25 Sep 2017 21:59:09 +0200 Parents: a3fdf6f0f698d0521678f196bde29a5c9e55e60b 8466ef90966c2e97a3f695813b08d1aa2a37ce6f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8cc0921846c2e6c8f2d47d0039d81c28b2643a1e Log: Merge branch 'PHP-7.2' * PHP-7.2: Remove some old sapi/apache_hooks and sapi/apache leftovers Changed paths: MM Makefile.global Diff: diff --cc Makefile.global index 204831c,6b49f38..096edb6 --- a/Makefile.global +++ b/Makefile.global @@@ -112,13 -112,13 +112,13 @@@ test: al clean: find . -name \*.gcno -o -name \*.gcda | xargs rm -f find . -name \*.lo -o -name \*.o | xargs rm -f - find . -name \*.la -o -name \*.a | xargs rm -f + find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f find . -name .libs -a -type d|xargs rm -rf - rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* + rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk..stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f php7.spec main/build-defs.h scripts/phpize rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar..1 @@@ -135,9 -135,9 +135,9 @@@ prof-gen prof-clean: find . -name \*.lo -o -name \*.o | xargs rm -f - find . -name \*.la -o -name \*.a | xargs rm -f + find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f - rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* + rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* prof-use: CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all

« previous php.cvs (#99535) next »