com php-src: Update gitignore and Makefile for additional entries: .gitignore Makefile.global
| From: | Will Fitch | Date: | Fri, 24 Jan 2014 02:28:45 +0000 |
| Subject: | com php-src: Update gitignore and Makefile for additional entries: .gitignore Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75770@lists.php.net to get a copy of this message | ||
Commit: c4c10a222e4358b1d9d28ef852e8a5d56709865d
Author: Will Fitch <willf@aweber.com> Thu, 23 Jan 2014 21:28:45 -0500
Parents: 0eff7176defea46d2453a109542480a4263621cb
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c4c10a222e4358b1d9d28ef852e8a5d56709865d
Log:
Update gitignore and Makefile for additional entries
Changed paths:
M .gitignore
M Makefile.global
Diff:
diff --git a/.gitignore b/.gitignore
index 6f291dc..32d6ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,6 +204,8 @@ ext/pdo_sqlite/sqlite3.h
ext/pdo_sqlite/tests/*.db
ext/pdo_sqlite/tests/*.tmp
ext/phar/phar.phar
+ext/phar/phar.1
+ext/phar/phar.phar.1
ext/pspell/tests/*.tmp
ext/reflection/xml
ext/reflection/html
@@ -235,12 +237,14 @@ sapi/apache/libphp5.module
sapi/apache2handler/libphp5.module
sapi/apache_hooks/libphp5.module
sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
sapi/cli/php.1
sapi/fpm/php-fpm
sapi/fpm/php-fpm.1
sapi/fpm/init.d.php-fpm
sapi/fpm/php-fpm.conf
sapi/fpm/fpm/php-cgi
+sapi/phpdbg/phpdbg
scripts/php-config
scripts/phpize
scripts/man1/*.1
diff --git a/Makefile.global b/Makefile.global
index 6b79ad7..ff858c2 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -113,6 +113,7 @@ clean:
find . -name \*.la -o -name \*.a | xargs rm -f
find . -name \*.so | xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
+ find . -name \*.1 | xargs rm -f
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
distclean: clean