mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: [ci skip] Update NEWS [ci skip] Update NEWS Fix #77035: The phpize and ./configure create redundant .deps file
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -26,7 +26,6 @@
|
||||
*.tar.xz.asc
|
||||
.FBCIndex
|
||||
.FBCLockFolder
|
||||
.deps
|
||||
.libs
|
||||
phpt.*
|
||||
core
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
.deps
|
||||
*.lo
|
||||
*.la
|
||||
.libs
|
||||
|
||||
@@ -11,7 +11,7 @@ SED="@SED@"
|
||||
|
||||
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
|
||||
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
|
||||
CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
|
||||
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
|
||||
mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
|
||||
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
|
||||
config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
|
||||
|
||||
@@ -195,7 +195,6 @@ PHP_GEN_BUILD_DIRS
|
||||
PHP_GEN_GLOBAL_MAKEFILE
|
||||
|
||||
test -d modules || $php_shtool mkdir modules
|
||||
touch .deps
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user