com php-src: Remove stamp-h: .gitignore Makefile.global stamp-h.in
| From: | Peter Kokot | Date: | Thu, 18 Oct 2018 06:35:43 +0000 |
| Subject: | com php-src: Remove stamp-h: .gitignore Makefile.global stamp-h.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103501@lists.php.net to get a copy of this message | ||
Commit: 370882bb598599a768b2fe05c7997d6248b68419
Author: Peter Kokot <peterkokot@gmail.com> Wed, 17 Oct 2018 06:06:50 +0200
Parents: 0e60b812c05ed5e3704ab6f31f29040040c3edd7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=370882bb598599a768b2fe05c7997d6248b68419
Log:
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
Changed paths:
M .gitignore
M Makefile.global
D stamp-h.in
Diff:
diff --git a/.gitignore b/.gitignore
index 1ee16de..9bd5c8f 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 3a7a18c..29d74d3 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 9788f70..0000000
--- a/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp