From addcf2402d221d7c67fa01c170fde08e5fe312d6 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 19 Oct 2018 10:00:16 +0200 Subject: [PATCH] Remove mkdep.awk The `mkdep.awk` file was part of the previous *nix build system and was used to create a .deps file with a list of dependencies that could be processed by Automake further on. Newer build system was done via 9d9d39a0de3bec962c343051011f5a2ed7d7b242 and outdated files removed via 22815419f8c5da902971d3aa12f2cbfcc3b41aff so the current file in the PHP source code is not used anymore. Additionally, the *.slo files were processed by this file. The *.slo files also used to be generated by older libtool so today, these don't get generated anymore. --- .gitignore | 1 - build/mkdep.awk | 73 ------------------------------------------- scripts/Makefile.frag | 1 - scripts/phpize.in | 2 +- 4 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 build/mkdep.awk diff --git a/.gitignore b/.gitignore index 0a3be5145c8..a23f574fef2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *~ .#* *. -*.slo *.mk *.mem *.gcda diff --git a/build/mkdep.awk b/build/mkdep.awk deleted file mode 100644 index 4bd4f3a07f1..00000000000 --- a/build/mkdep.awk +++ /dev/null @@ -1,73 +0,0 @@ -# +----------------------------------------------------------------------+ -# | PHP Version 7 | -# +----------------------------------------------------------------------+ -# | Copyright (c) 2000-2006 The PHP Group | -# +----------------------------------------------------------------------+ -# | This source file is subject to version 3.01 of the PHP license, | -# | that is bundled with this package in the file LICENSE, and is | -# | available through the world-wide-web at the following url: | -# | http://www.php.net/license/3_01.txt | -# | If you did not receive a copy of the PHP license and are unable to | -# | obtain it through the world-wide-web, please send a note to | -# | license@php.net so we can mail you a copy immediately. | -# +----------------------------------------------------------------------+ -# | Author: Sascha Schumann | -# +----------------------------------------------------------------------+ -# -# Usage: -# -# echo top_srcdir top_builddir srcdir CPP [CPP-ARGS] filenames | \ -# awk -f mkdep.awk > dependencies - - -{ - top_srcdir=$1 - top_builddir=$2 - srcdir=$3 - cmd=$4 - - for (i = 5; i <= NF; i++) { - if (match($i, "^-[A-Z]") == 0) - break; - cmd=cmd " " $i - } - - dif=i-1 - - for (; i <= NF; i++) - filenames[i-dif]=$i - - no_files=NF-dif - - for(i = 1; i <= no_files; i++) { - if (system("test -r " filenames[i]) != 0) - continue - - target=filenames[i] - sub(srcdir "/", "", target) - target2=target - sub("\.(c|cpp)$", ".lo", target); - sub("\.(c|cpp)$", ".slo", target2); - - for (e in used) - delete used[e] - - cmdx=cmd " " filenames[i] - done=0 - while ((cmdx | getline) > 0) { - if (match($0, "^# [0-9]* \".*\.h\"") != 0) { - if (sub(top_srcdir, "$(top_srcdir)", $3) == 0) - sub(top_builddir, "$(top_builddir)", $3) - if (substr($3,2,1) != "/" && used[$3] != 1) { - if (done == 0) - printf(target " " target2 ":") - done=1 - printf(" \\\n\t" substr($3,2,length($3)-2)) - used[$3] = 1; - } - } - } - if (done == 1) - print "\n" - } -} diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index fdf67f04388..d7f8475014e 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -7,7 +7,6 @@ phpbuilddir = $(libdir)/build BUILD_FILES = \ scripts/phpize.m4 \ - build/mkdep.awk \ build/scan_makefile_in.awk \ build/libtool.m4 \ build/ax_check_compile_flag.m4 \ diff --git a/scripts/phpize.in b/scripts/phpize.in index 3e863852f68..5cb62a3736a 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -9,7 +9,7 @@ includedir="`eval echo @includedir@`/php" builddir="`pwd`" SED="@SED@" -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4" +FILES_BUILD="scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4" FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \