1 diff -burN php-5.0.0b3/Makefile.global php-5.0.0b3-shared/Makefile.global
2 --- php-5.0.0b3/Makefile.global 2003-12-04 16:57:55.000000000 +0100
3 +++ php-5.0.0b3-shared/Makefile.global 2003-12-25 16:52:55.000000000 +0100
6 build-modules: $(PHP_MODULES)
8 -libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
9 - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
10 +libphp_common.la: $(PHP_GLOBAL_OBJS)
11 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
13 +libphp5.la: libphp_common.la $(PHP_SAPI_OBJS)
14 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
15 -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
17 libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
19 install-sapi: $(OVERALL_TARGET)
20 @echo "Installing PHP SAPI module: $(PHP_SAPI)"
21 -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
22 - -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
23 + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
24 for i in 0.0.0 0.0 0; do \
25 - if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
26 - $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
27 + if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
28 + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
32 diff -burN php-5.0.0b3/sapi/cgi/config9.m4 php-5.0.0b3-shared/sapi/cgi/config9.m4
33 --- php-5.0.0b3/sapi/cgi/config9.m4 2003-12-01 16:17:08.000000000 +0100
34 +++ php-5.0.0b3-shared/sapi/cgi/config9.m4 2003-12-25 16:54:16.000000000 +0100
36 BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
39 - BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
40 + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
44 diff -burN php-5.0.0b3/sapi/cgi/Makefile.frag php-5.0.0b3-shared/sapi/cgi/Makefile.frag
45 --- php-5.0.0b3/sapi/cgi/Makefile.frag 2003-07-02 03:08:26.000000000 +0200
46 +++ php-5.0.0b3-shared/sapi/cgi/Makefile.frag 2003-12-25 16:53:17.000000000 +0100
48 -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
49 +$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
51 diff -burN php-5.0.0b3/sapi/cli/config.m4 php-5.0.0b3-shared/sapi/cli/config.m4
52 --- php-5.0.0b3/sapi/cli/config.m4 2003-12-01 16:17:10.000000000 +0100
53 +++ php-5.0.0b3-shared/sapi/cli/config.m4 2003-12-25 16:55:07.000000000 +0100
55 BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
58 - BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
59 + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
62 INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
63 diff -burN php-5.0.0b3/sapi/cli/Makefile.frag php-5.0.0b3-shared/sapi/cli/Makefile.frag
64 --- php-5.0.0b3/sapi/cli/Makefile.frag 2003-09-02 23:41:01.000000000 +0200
65 +++ php-5.0.0b3-shared/sapi/cli/Makefile.frag 2003-12-25 16:54:40.000000000 +0100
69 -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
70 +$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS)
73 install-cli: $(SAPI_CLI_PATH)