1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Move Makefile.global and Makefile.gcov to build directory

These files can be stored in the build directory instead of bloating the
project root directory.
This commit is contained in:
Peter Kokot
2019-03-04 06:06:10 +01:00
parent deb44d405e
commit 2957651c5c
8 changed files with 7 additions and 7 deletions

2
.gitignore vendored
View File

@@ -261,7 +261,7 @@ phpt.*
tmp-php.ini
# ------------------------------------------------------------------------------
# Generated by GCC's gcov and LCOV via Makefile.gcov and gcov.php.net
# Generated by GCC's gcov and LCOV via build/Makefile.gcov and gcov.php.net
# ------------------------------------------------------------------------------
*.gcda
*.gcno

View File

@@ -160,7 +160,7 @@ EOF
eval echo "$i = \$$i" >> Makefile
done
cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile
cat $abs_srcdir/build/Makefile.global Makefile.fragments Makefile.objects >> Makefile
])
dnl

View File

@@ -870,7 +870,7 @@ if test "$PHP_GCOV" = "yes"; then
fi
AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir)
dnl Remove all optimization flags from CFLAGS
changequote({,})

View File

@@ -2360,7 +2360,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
}
/* Check for deprecated directives */
/* NOTE: If you add anything here, remember to add it to Makefile.global! */
/* NOTE: If you add anything here, remember to add it to build/Makefile.global! */
{
struct {
const long error_level;

View File

@@ -13,7 +13,7 @@ BUILD_FILES = \
build/ax_gcc_func_attribute.m4 \
build/php_cxx_compile_stdcxx.m4 \
build/pkg.m4 \
Makefile.global \
build/Makefile.global \
acinclude.m4 \
run-tests.php

View File

@@ -9,8 +9,8 @@ includedir="`eval echo @includedir@`/php"
builddir="`pwd`"
SED="@SED@"
FILES_BUILD="shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh"
FILES="acinclude.m4 Makefile.global run-tests*.php"
FILES_BUILD="shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global"
FILES="acinclude.m4 run-tests*.php"
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
config.nice configure configure.ac \
aclocal.m4 config.h config.h.in conftest* libtool config.cache autom4te.cache/ \