projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 917119c9 AM |
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 | |
| 4 | @@ -14,8 +14,11 @@ | |
| 220dfde4 | 5 | |
| 554abb27 | 6 | build-modules: $(PHP_MODULES) |
| 7a5af891 | 7 | |
| 917119c9 | 8 | -libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 554abb27 JB |
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) | |
| 220dfde4 | 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) |
| 554abb27 | 12 | + |
| 917119c9 | 13 | +libphp5.la: libphp_common.la $(PHP_SAPI_OBJS) |
| 554abb27 | 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 $@ |
| 917119c9 | 15 | -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1 |
| 7a5af891 | 16 | |
| 917119c9 AM |
17 | libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 18 | @@ -26,10 +29,10 @@ | |
| 220dfde4 AG |
19 | install-sapi: $(OVERALL_TARGET) |
| 20 | @echo "Installing PHP SAPI module: $(PHP_SAPI)" | |
| f161d428 | 21 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| 917119c9 | 22 | - -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \ |
| 7a5af891 | 23 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ |
| 220dfde4 | 24 | for i in 0.0.0 0.0 0; do \ |
| 917119c9 AM |
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); \ | |
| 7a5af891 JR |
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); \ | |
| 220dfde4 AG |
29 | break; \ |
| 30 | fi; \ | |
| 31 | done; \ | |
| 917119c9 AM |
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 | |
| 220dfde4 | 35 | @@ -156,7 +156,7 @@ |
| 917119c9 | 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)" |
| eac78ba2 JB |
37 | ;; |
| 38 | *) | |
| 5beae860 AG |
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)" | |
| eac78ba2 JB |
41 | ;; |
| 42 | esac | |
| 43 | ||
| 917119c9 AM |
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 | |
| 47 | @@ -1,2 +1,2 @@ | |
| 48 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
| 49 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) | |
| 50 | $(BUILD_CGI) | |
| 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 | |
| 220dfde4 | 54 | @@ -27,7 +27,7 @@ |
| 917119c9 | 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)" |
| eac78ba2 JB |
56 | ;; |
| 57 | *) | |
| 5beae860 AG |
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)" | |
| eac78ba2 JB |
60 | ;; |
| 61 | esac | |
| 917119c9 AM |
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 | |
| 66 | @@ -1,6 +1,6 @@ | |
| 67 | cli: $(SAPI_CLI_PATH) | |
| 68 | ||
| 69 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) | |
| 70 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) | |
| 71 | $(BUILD_CLI) | |
| 72 | ||
| 73 | install-cli: $(SAPI_CLI_PATH) |