Skip to content

Commit

Permalink
Move Makefile.global and Makefile.gcov to build directory
Browse files Browse the repository at this point in the history
These files can be stored in the build directory instead of bloating the
project root directory.
  • Loading branch information
petk committed Mar 4, 2019
1 parent deb44d4 commit 2957651
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion acinclude.m4
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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({,})
Expand Down
2 changes: 1 addition & 1 deletion main/main.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion scripts/Makefile.frag
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions scripts/phpize.in
Expand Up @@ -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/ \
Expand Down

0 comments on commit 2957651

Please sign in to comment.