diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-17 06:06:50 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-18 08:35:43 +0200 |
| commit | 370882bb598599a768b2fe05c7997d6248b68419 (patch) | |
| tree | 5e06416fb75d95c4e5dc2cafea96e6787026697a | |
| parent | 0e60b812c05ed5e3704ab6f31f29040040c3edd7 (diff) | |
| download | php-git-370882bb598599a768b2fe05c7997d6248b68419.tar.gz | |
Remove stamp-h
The stamp-* files can be used as helpers for Makefiles to not redo
certain targets again. The stamp-h are mentioned in the Autoconf docs [1]
to help generate the config.h file.
Since the usage of stamp-h file was removed in 232afa4816c60a20d3db48c304ac59312d46ec46
this patch cleans few obsolete occurrences.
This patch also removes two occurrences of `main/stamp-h1` and
`main/streams/stamp-h1` rules in the .gitignore file since they are not
generated with the current build systems anymore. The `stamp-h$am_indx` files
were once generated using aclocal and automake.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.global | 2 | ||||
| -rw-r--r-- | stamp-h.in | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 1ee16de4c7..9bd5c8f26a 100644 --- a/.gitignore +++ b/.gitignore @@ -71,19 +71,15 @@ php_test_results_*.txt php_version.h results.txt shlibtool -stamp-h test.php3 tmp-php.ini -stamp-h.in scan_makefile_in.awk main/php_config.h main/php_config.h.in main/build-defs.h main/internal_functions_cli.c main/config.w32.h -main/stamp-h1 main/streams/build-defs.h -main/streams/stamp-h1 pear/install-pear-nozlib.phar pear/phpize pear/run-tests diff --git a/Makefile.global b/Makefile.global index 3a7a18cc3f..29d74d3acb 100644 --- a/Makefile.global +++ b/Makefile.global @@ -118,7 +118,7 @@ clean: rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h + rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f php7.spec main/build-defs.h scripts/phpize rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1 diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index 9788f70238..0000000000 --- a/stamp-h.in +++ /dev/null @@ -1 +0,0 @@ -timestamp |