mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Overall UNIX build system improvements:
* Makefile header is now completely dynamic * Absolute paths in (top_)?(src|build)dir and VPATH (fixes Tru64 support) * VPATH does not contain variables anymore (fixes UnixWare support)
This commit is contained in:
parent
be00d130e6
commit
8d19edc495
11
Makefile.in
11
Makefile.in
@ -1,9 +1,4 @@
|
|||||||
|
|
||||||
DEPTH = .
|
|
||||||
topsrcdir = @topsrcdir@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
|
|
||||||
ZEND_DIR = $(srcdir)/Zend
|
ZEND_DIR = $(srcdir)/Zend
|
||||||
SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
|
SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
|
||||||
|
|
||||||
@ -36,9 +31,9 @@ targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME)
|
|||||||
|
|
||||||
install_targets = install-local install-modules
|
install_targets = install-local install-modules
|
||||||
|
|
||||||
include $(topsrcdir)/build/rules.mk
|
include $(top_srcdir)/build/rules.mk
|
||||||
include $(topsrcdir)/build/library.mk
|
include $(top_srcdir)/build/library.mk
|
||||||
include $(topsrcdir)/build/program.mk
|
include $(top_srcdir)/build/program.mk
|
||||||
|
|
||||||
install-local:
|
install-local:
|
||||||
@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
|
@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
|
||||||
|
1
NEWS
1
NEWS
@ -2,6 +2,7 @@ PHP 4.0 NEWS
|
|||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||
|
|
||||||
?? ??? 2000, Version 4.0.0 Release
|
?? ??? 2000, Version 4.0.0 Release
|
||||||
|
- Improved UNIX build system to support more vendor make tools (Sascha)
|
||||||
- Updated natural comparison/sorting algorithm by Martin Pool
|
- Updated natural comparison/sorting algorithm by Martin Pool
|
||||||
<mbp@humbug.org.au>. (Andrei)
|
<mbp@humbug.org.au>. (Andrei)
|
||||||
- Fixed a crash in array_multisort() that happened when empty arrays
|
- Fixed a crash in array_multisort() that happened when empty arrays
|
||||||
|
@ -23,29 +23,37 @@
|
|||||||
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# $Id: fastgen.sh,v 1.2 2000-01-01 20:48:42 sas Exp $
|
# $Id: fastgen.sh,v 1.3 2000-04-30 03:10:34 sas Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
srcdir=$1
|
srcdir=$1
|
||||||
shift
|
shift
|
||||||
|
|
||||||
topsrcdir=`(cd $srcdir; pwd)`
|
|
||||||
|
|
||||||
mkdir_p=$1
|
mkdir_p=$1
|
||||||
shift
|
shift
|
||||||
|
|
||||||
|
top_srcdir=`(cd $srcdir; pwd)`
|
||||||
|
top_builddir=`pwd`
|
||||||
|
|
||||||
if test "$mkdir_p" = "yes"; then
|
if test "$mkdir_p" = "yes"; then
|
||||||
mkdir_p="mkdir -p"
|
mkdir_p="mkdir -p"
|
||||||
else
|
else
|
||||||
mkdir_p="$topsrcdir/build/shtool mkdir -f -p"
|
mkdir_p="$top_srcdir/helpers/mkdir.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in $@ ; do
|
for makefile in $@; do
|
||||||
echo "creating $i"
|
echo "creating $makefile"
|
||||||
dir=`dirname $i`
|
# portable dirname
|
||||||
$mkdir_p $dir
|
dir=`echo $makefile|sed 's%[^/][^/]*$%%'`
|
||||||
sed \
|
test -d "$dir/" || $mkdir_p "$dir/"
|
||||||
-e s#@topsrcdir@#$topsrcdir# \
|
|
||||||
-e s#@srcdir@#$topsrcdir/$dir# \
|
(cat <<EOF
|
||||||
< $topsrcdir/$i.in > $i
|
top_srcdir = $top_srcdir
|
||||||
|
top_builddir = $top_builddir
|
||||||
|
srcdir = $top_srcdir/$dir
|
||||||
|
builddir = $top_builddir/$dir
|
||||||
|
VPATH = $top_srcdir/$dir
|
||||||
|
EOF
|
||||||
|
)| cat - $top_srcdir/$makefile.in > $makefile
|
||||||
|
|
||||||
done
|
done
|
||||||
|
@ -26,6 +26,6 @@
|
|||||||
|
|
||||||
targets = $(LTLIBRARY_NAME)
|
targets = $(LTLIBRARY_NAME)
|
||||||
|
|
||||||
include $(topsrcdir)/build/rules.mk
|
include $(top_srcdir)/build/rules.mk
|
||||||
include $(topsrcdir)/build/library.mk
|
include $(top_srcdir)/build/library.mk
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
# $Id$
|
# $Id$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(DEPTH)/config_vars.mk
|
include $(top_builddir)/config_vars.mk
|
||||||
|
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||||
@ -34,11 +34,9 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
|
|||||||
INSTALL = $(top_srcdir)/build/shtool install -c
|
INSTALL = $(top_srcdir)/build/shtool install -c
|
||||||
INSTALL_DATA = $(INSTALL) -m 644
|
INSTALL_DATA = $(INSTALL) -m 644
|
||||||
|
|
||||||
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
|
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir)
|
||||||
|
|
||||||
moduledir = $(libdir)/php/modules
|
moduledir = $(libdir)/php/modules
|
||||||
top_srcdir = $(topsrcdir)
|
|
||||||
top_builddir = $(DEPTH)
|
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .S .c .lo .o .s .y .l
|
.SUFFIXES: .S .c .lo .o .s .y .l
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
# $Id$
|
# $Id$
|
||||||
#
|
#
|
||||||
|
|
||||||
include $(DEPTH)/config_vars.mk
|
include $(top_builddir)/config_vars.mk
|
||||||
|
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
||||||
@ -34,11 +34,9 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p
|
|||||||
INSTALL = $(top_srcdir)/build/shtool install -c
|
INSTALL = $(top_srcdir)/build/shtool install -c
|
||||||
INSTALL_DATA = $(INSTALL) -m 644
|
INSTALL_DATA = $(INSTALL) -m 644
|
||||||
|
|
||||||
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(DEPTH)
|
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I$(top_builddir)
|
||||||
|
|
||||||
moduledir = $(libdir)/php/modules
|
moduledir = $(libdir)/php/modules
|
||||||
top_srcdir = $(topsrcdir)
|
|
||||||
top_builddir = $(DEPTH)
|
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .S .c .lo .o .s .y .l
|
.SUFFIXES: .S .c .lo .o .s .y .l
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
|
|
||||||
DEPTH = ..
|
|
||||||
topsrcdir = @topsrcdir@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
|
|
||||||
SUBDIRS = $(EXT_STATIC) $(EXT_SHARED)
|
SUBDIRS = $(EXT_STATIC) $(EXT_SHARED)
|
||||||
|
|
||||||
all:
|
all:
|
||||||
@ -18,4 +13,4 @@ all:
|
|||||||
|
|
||||||
NO_RECURSION = all
|
NO_RECURSION = all
|
||||||
|
|
||||||
include $(topsrcdir)/build/rules.mk
|
include $(top_srcdir)/build/rules.mk
|
||||||
|
@ -64,15 +64,10 @@ $ECHO_N " Makefile.in$ECHO_C"
|
|||||||
cat >Makefile.in <<eof
|
cat >Makefile.in <<eof
|
||||||
# \$Id\$
|
# \$Id\$
|
||||||
|
|
||||||
DEPTH = ../..
|
|
||||||
topsrcdir = @topsrcdir@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
|
|
||||||
LTLIBRARY_NAME = lib$extname.la
|
LTLIBRARY_NAME = lib$extname.la
|
||||||
LTLIBRARY_SOURCES = $extname.c
|
LTLIBRARY_SOURCES = $extname.c
|
||||||
|
|
||||||
include \$(topsrcdir)/build/ltlib.mk
|
include \$(top_srcdir)/build/ltlib.mk
|
||||||
eof
|
eof
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user