diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-04 06:06:10 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-04 12:30:42 +0100 |
| commit | 2957651c5c2a003e96318fc9217764b91266723a (patch) | |
| tree | e41d1fa82115e700cd843fab7e3292c24fcd6528 | |
| parent | deb44d405eb27a6654ad9a57c1e5f641218b22a4 (diff) | |
| download | php-git-2957651c5c2a003e96318fc9217764b91266723a.tar.gz | |
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.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | build/Makefile.gcov (renamed from Makefile.gcov) | 0 | ||||
| -rw-r--r-- | build/Makefile.global (renamed from Makefile.global) | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 2 | ||||
| -rw-r--r-- | scripts/phpize.in | 4 |
8 files changed, 7 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 885a08660e..002fdcad79 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/acinclude.m4 b/acinclude.m4 index cec05c4d41..cea6db87ff 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 diff --git a/Makefile.gcov b/build/Makefile.gcov index 640ac0a710..640ac0a710 100644 --- a/Makefile.gcov +++ b/build/Makefile.gcov diff --git a/Makefile.global b/build/Makefile.global index 9e1fa9738c..9e1fa9738c 100644 --- a/Makefile.global +++ b/build/Makefile.global diff --git a/configure.ac b/configure.ac index c716b7b6fd..f79d8fef1b 100644 --- a/configure.ac +++ b/configure.ac @@ -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({,}) diff --git a/main/main.c b/main/main.c index d59633f17a..5692c76ca4 100644 --- a/main/main.c +++ b/main/main.c @@ -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; diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index 47acf60c7c..db8ff60c06 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -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 diff --git a/scripts/phpize.in b/scripts/phpize.in index 7db2386e6a..57c09555d2 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -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/ \ |