Skip to content

Commit 2957651

Browse files
committed
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.
1 parent deb44d4 commit 2957651

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ phpt.*
261261
tmp-php.ini
262262

263263
# ------------------------------------------------------------------------------
264-
# Generated by GCC's gcov and LCOV via Makefile.gcov and gcov.php.net
264+
# Generated by GCC's gcov and LCOV via build/Makefile.gcov and gcov.php.net
265265
# ------------------------------------------------------------------------------
266266
*.gcda
267267
*.gcno

acinclude.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ EOF
160160
eval echo "$i = \$$i" >> Makefile
161161
done
162162
163-
cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile
163+
cat $abs_srcdir/build/Makefile.global Makefile.fragments Makefile.objects >> Makefile
164164
])
165165

166166
dnl
File renamed without changes.
File renamed without changes.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ if test "$PHP_GCOV" = "yes"; then
870870
fi
871871

872872
AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
873-
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
873+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir)
874874

875875
dnl Remove all optimization flags from CFLAGS
876876
changequote({,})

main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2360,7 +2360,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
23602360
}
23612361

23622362
/* Check for deprecated directives */
2363-
/* NOTE: If you add anything here, remember to add it to Makefile.global! */
2363+
/* NOTE: If you add anything here, remember to add it to build/Makefile.global! */
23642364
{
23652365
struct {
23662366
const long error_level;

scripts/Makefile.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BUILD_FILES = \
1313
build/ax_gcc_func_attribute.m4 \
1414
build/php_cxx_compile_stdcxx.m4 \
1515
build/pkg.m4 \
16-
Makefile.global \
16+
build/Makefile.global \
1717
acinclude.m4 \
1818
run-tests.php
1919

scripts/phpize.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ includedir="`eval echo @includedir@`/php"
99
builddir="`pwd`"
1010
SED="@SED@"
1111

12-
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"
13-
FILES="acinclude.m4 Makefile.global run-tests*.php"
12+
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"
13+
FILES="acinclude.m4 run-tests*.php"
1414
CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
1515
config.nice configure configure.ac \
1616
aclocal.m4 config.h config.h.in conftest* libtool config.cache autom4te.cache/ \

0 commit comments

Comments
 (0)