jani Mon, 20 Jul 2009 10:51:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284427
Changed paths:
U php/php-src/branches/PHP_5_2/build/build.mk
U php/php-src/branches/PHP_5_2/buildconf
U php/php-src/branches/PHP_5_3/build/build.mk
U php/php-src/branches/PHP_5_3/buildconf
U php/php-src/trunk/build/build.mk
U php/php-src/trunk/buildconf
Log:
- Removed unused parts
Modified: php/php-src/branches/PHP_5_2/build/build.mk
===================================================================
--- php/php-src/branches/PHP_5_2/build/build.mk 2009-07-20 10:19:21 UTC (rev
284426)
+++ php/php-src/branches/PHP_5_2/build/build.mk 2009-07-20 10:51:40 UTC (rev
284427)
@@ -20,10 +20,8 @@
# Makefile to generate build tools
#
-ZENDDIR = Zend
+SUBDIRS = Zend TSRM
-SUBDIRS = $(ZENDDIR) TSRM
-
STAMP = buildmk.stamp
ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk
generated_lists:
- @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
- TSRM/Makefile.am > $@
- @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
- @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4
\
- $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+ @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
+ @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+ Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)
Modified: php/php-src/branches/PHP_5_2/buildconf
===================================================================
--- php/php-src/branches/PHP_5_2/buildconf 2009-07-20 10:19:21 UTC (rev
284426)
+++ php/php-src/branches/PHP_5_2/buildconf 2009-07-20 10:51:40 UTC (rev
284427)
@@ -36,7 +36,7 @@
rm -f generated_lists
if test "$debug" = "yes"; then
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
+ ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=""
else
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
+ ${MAKE:-make} -s -f build/build.mk
fi
Modified: php/php-src/branches/PHP_5_3/build/build.mk
===================================================================
--- php/php-src/branches/PHP_5_3/build/build.mk 2009-07-20 10:19:21 UTC (rev
284426)
+++ php/php-src/branches/PHP_5_3/build/build.mk 2009-07-20 10:51:40 UTC (rev
284427)
@@ -20,10 +20,8 @@
# Makefile to generate build tools
#
-ZENDDIR = Zend
+SUBDIRS = Zend TSRM
-SUBDIRS = $(ZENDDIR) TSRM
-
STAMP = buildmk.stamp
ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk
generated_lists:
- @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
- TSRM/Makefile.am > $@
- @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
- @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4
\
- $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+ @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
+ @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+ Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)
Modified: php/php-src/branches/PHP_5_3/buildconf
===================================================================
--- php/php-src/branches/PHP_5_3/buildconf 2009-07-20 10:19:21 UTC (rev
284426)
+++ php/php-src/branches/PHP_5_3/buildconf 2009-07-20 10:51:40 UTC (rev
284427)
@@ -36,7 +36,7 @@
rm -f generated_lists
if test "$debug" = "yes"; then
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
+ ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=""
else
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
+ ${MAKE:-make} -s -f build/build.mk
fi
Modified: php/php-src/trunk/build/build.mk
===================================================================
--- php/php-src/trunk/build/build.mk 2009-07-20 10:19:21 UTC (rev 284426)
+++ php/php-src/trunk/build/build.mk 2009-07-20 10:51:40 UTC (rev 284427)
@@ -20,10 +20,8 @@
# Makefile to generate build tools
#
-ZENDDIR = Zend
+SUBDIRS = Zend TSRM
-SUBDIRS = $(ZENDDIR) TSRM
-
STAMP = buildmk.stamp
ALWAYS = generated_lists
@@ -33,11 +31,10 @@
@$(MAKE) -s -f build/build2.mk
generated_lists:
- @echo makefile_am_files = $(ZENDDIR)/Makefile.am \
- TSRM/Makefile.am > $@
- @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
- @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4
\
- $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+ @echo makefile_am_files = Zend/Makefile.am TSRM/Makefile.am > $@
+ @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+ @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
+ Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
$(STAMP): build/buildcheck.sh
@build/buildcheck.sh $(STAMP)
Modified: php/php-src/trunk/buildconf
===================================================================
--- php/php-src/trunk/buildconf 2009-07-20 10:19:21 UTC (rev 284426)
+++ php/php-src/trunk/buildconf 2009-07-20 10:51:40 UTC (rev 284427)
@@ -36,7 +36,7 @@
rm -f generated_lists
if test "$debug" = "yes"; then
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/" SUPPRESS_WARNINGS=""
+ ${MAKE:-make} -s -f build/build.mk SUPPRESS_WARNINGS=""
else
- ${MAKE:-make} -s -f build/build.mk ZENDDIR="Zend/"
+ ${MAKE:-make} -s -f build/build.mk
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
