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.

diff --git a/.gitignore b/.gitignore
index 885a08660e628624ae315150de7cce7b4f1faa47..002fdcad79de572bcf810b968aefe3f5f042af76 100644 (file)
--- 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 cec05c4d415ac31bfb4226d25a240e5b6fd6a6a8..cea6db87ffd5080a02fd4f5d0bc5decfa36ed038 100644 (file)
--- 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
similarity index 100%
rename from Makefile.gcov
rename to build/Makefile.gcov

diff --git a/Makefile.global b/build/Makefile.global
similarity index 100%
rename from Makefile.global
rename to build/Makefile.global

diff --git a/configure.ac b/configure.ac
index c716b7b6fd632b83aa019ae99f9e37d44b124a0d..f79d8fef1bcffe15dde1c5d39211cda1edce95aa 100644 (file)
--- 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 d59633f17a58aa1c74922cd4bf390f7491227ac8..5692c76ca4930358673129115503c49b4f87e2fd 100644 (file)
--- 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 47acf60c7c1d8b2e837c5952a7b2e2f4e36db7b0..db8ff60c06dba7f407f24c39367ea54366d7d20f 100644 (file)
--- 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 7db2386e6aee72e369d2ca679e05bb6978429a21..57c09555d2e59f981f133d9e2dae42acff66ec37 100644 (file)
--- 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/ \