Skip to content

Commit 5531dde

Browse files
committed
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: [ci skip] Update NEWS Fix #77035: The phpize and ./configure create redundant .deps file
2 parents de9f325 + 4be0528 commit 5531dde

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*.tar.xz.asc
2727
.FBCIndex
2828
.FBCLockFolder
29-
.deps
3029
.libs
3130
phpt.*
3231
core

ext/ext_skel

-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ eof
207207

208208
$ECHO_N " .gitignore$ECHO_C"
209209
cat >.gitignore <<eof
210-
.deps
211210
*.lo
212211
*.la
213212
.libs

scripts/phpize.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SED="@SED@"
1111

1212
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
1313
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
14-
CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
14+
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
1515
mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
1616
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
1717
config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \

scripts/phpize.m4

-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ PHP_GEN_BUILD_DIRS
195195
PHP_GEN_GLOBAL_MAKEFILE
196196

197197
test -d modules || $php_shtool mkdir modules
198-
touch .deps
199198

200199
AC_CONFIG_HEADER(config.h)
201200

0 commit comments

Comments
 (0)