sniper Sun Jun 8 20:17:03 2003 EDT
Added files:
/php4/build scan_makefile_in.awk
Removed files:
/php4 scan_makefile_in.awk
Modified files:
/php4 acinclude.m4
/php4/scripts Makefile.frag phpize.in
Log:
- Moved scan_makefile_in.awk to better suitable place for it.
(other build related scripts are under build/ too..)
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.245 php4/acinclude.m4:1.246
--- php4/acinclude.m4:1.245 Mon May 19 17:11:44 2003
+++ php4/acinclude.m4 Sun Jun 8 20:17:03 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.245 2003/05/19 21:11:44 sniper Exp $
+dnl $Id: acinclude.m4,v 1.246 2003/06/09 00:17:03 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -1240,7 +1240,7 @@
dnl deprecated
AC_DEFUN([PHP_EXTENSION],[
- sources=`$AWK -f $abs_srcdir/scan_makefile_in.awk <
[]PHP_EXT_SRCDIR($1)[]/Makefile.in`
+ sources=`$AWK -f $abs_srcdir/build/scan_makefile_in.awk <
[]PHP_EXT_SRCDIR($1)[]/Makefile.in`
PHP_NEW_EXTENSION($1, $sources, $2, $3)
Index: php4/scripts/Makefile.frag
diff -u php4/scripts/Makefile.frag:1.2 php4/scripts/Makefile.frag:1.3
--- php4/scripts/Makefile.frag:1.2 Sat Mar 1 08:52:11 2003
+++ php4/scripts/Makefile.frag Sun Jun 8 20:17:03 2003
@@ -10,8 +10,8 @@
scripts/phpize.m4 \
build/mkdep.awk \
build/shtool \
+ build/scan_makefile_in.awk \
Makefile.global \
- scan_makefile_in.awk \
acinclude.m4
bin_SCRIPTS = phpize php-config
Index: php4/scripts/phpize.in
diff -u php4/scripts/phpize.in:1.1 php4/scripts/phpize.in:1.2
--- php4/scripts/phpize.in:1.1 Tue Jan 28 05:59:11 2003
+++ php4/scripts/phpize.in Sun Jun 8 20:17:03 2003
@@ -5,8 +5,8 @@
includedir="$prefix/include/php"
builddir="`pwd`"
-FILES_BUILD="mkdep.awk shtool"
-FILES="acinclude.m4 Makefile.global scan_makefile_in.awk"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
+FILES="acinclude.m4 Makefile.global"
CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \
mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \
Index: php4/build/scan_makefile_in.awk
+++ php4/build/scan_makefile_in.awk
BEGIN {
mode=0
sources=""
}
mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ {
if (match($0, "[^=]*$")) {
sources=substr($0, RSTART, RLENGTH-1)
}
mode=1
next
}
mode == 0 && /^LTLIBRARY_SOURCES.*/ {
if (match($0, "[^=]*$")) {
sources=substr($0, RSTART, RLENGTH)
}
}
mode == 1 && /.*\\$/ {
sources=sources substr($0, 0, length - 1)
next
}
mode == 1 {
sources=sources $0
mode=0
}
END {
print sources
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
