sniper Tue Nov 29 17:26:07 2005 EDT
Modified files:
/php-src buildconf
/php-src/build build.mk build2.mk
Log:
- Remove unused lines
http://cvs.php.net/diff.php/php-src/buildconf?r1=1.65&r2=1.66&ty=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.65 php-src/buildconf:1.66
--- php-src/buildconf:1.65 Tue Aug 9 05:52:45 2005
+++ php-src/buildconf Tue Nov 29 17:26:04 2005
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: buildconf,v 1.65 2005/08/09 09:52:45 derick Exp $
+# $Id: buildconf,v 1.66 2005/11/29 22:26:04 sniper Exp $
eval `grep '^EXTRA_VERSION=' configure.in`
case "$EXTRA_VERSION" in
@@ -15,10 +15,6 @@
debug=no
while test $# -gt 0; do
- if test "$1" = "--copy"; then
- automake_flags=--copy
- fi
-
if test "$1" = "--force"; then
devok=1
echo "Forcing buildconf"
@@ -67,7 +63,7 @@
rm -f generated_lists
if test "$debug" = "yes"; then
- ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
+ ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR" SUPPRESS_WARNINGS=""
else
- ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"
ZENDDIR="$ZENDDIR"
+ ${MAKE:-make} -s -f build/build.mk ZENDDIR="$ZENDDIR"
fi
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.26&r2=1.27&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.26 php-src/build/build.mk:1.27
--- php-src/build/build.mk:1.26 Wed Aug 3 10:06:37 2005
+++ php-src/build/build.mk Tue Nov 29 17:26:07 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build.mk,v 1.26 2005/08/03 14:06:37 sniper Exp $
+# $Id: build.mk,v 1.27 2005/11/29 22:26:07 sniper Exp $
#
#
# Makefile to generate build tools
@@ -30,7 +30,7 @@
all: $(STAMP) $(ALWAYS)
- @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
+ @$(MAKE) -s -f build/build2.mk
generated_lists:
@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
@@ -55,7 +55,7 @@
test -d $$i || (test -d ../$$i && cp -rp ../$$i $$i); \
done; \
find . -type l -exec rm {} \; ; \
- $(MAKE) AMFLAGS=--copy -f build/build.mk; \
+ $(MAKE) -f build/build.mk; \
cd ..; \
tar cf $$distname.tar $$distname; \
rm -rf $$distname $$distname.tar.*; \
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.37&r2=1.38&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.37 php-src/build/build2.mk:1.38
--- php-src/build/build2.mk:1.37 Wed Aug 3 10:06:38 2005
+++ php-src/build/build2.mk Tue Nov 29 17:26:07 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.37 2005/08/03 14:06:38 sniper Exp $
+# $Id: build2.mk,v 1.38 2005/11/29 22:26:07 sniper Exp $
#
include generated_lists
@@ -23,9 +23,6 @@
LT_TARGETS = ltmain.sh config.guess config.sub
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files = $(makefile_am_files:e.am=e)
-
config_h_in = main/php_config.h.in
acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
