projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 554abb27 JB |
1 | --- php-4.3.0/Makefile.global.orig Tue Nov 12 18:40:38 2002 |
| 2 | +++ php-4.3.0/Makefile.global Thu Jan 2 23:29:35 2003 | |
| 3 | @@ -10,8 +10,11 @@ | |
| 7a5af891 | 4 | |
| 554abb27 | 5 | build-modules: $(PHP_MODULES) |
| 7a5af891 | 6 | |
| 554abb27 JB |
7 | -libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 8 | - $(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 $@ | |
| 9 | +libphp_common.la: $(PHP_GLOBAL_OBJS) | |
| 10 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) -version-info 0:0:0 | |
| 11 | + | |
| 12 | +libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) | |
| 13 | + $(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 $@ | |
| 7a5af891 | 14 | |
| 554abb27 JB |
15 | libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) |
| 16 | $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so | |
| 17 | @@ -20,8 +23,17 @@ | |
| 7a5af891 | 18 | |
| 554abb27 JB |
19 | install-sapi: libphp4.la |
| 20 | @echo "Installing PHP SAPI module" | |
| 21 | + -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1 | |
| 22 | -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 | |
| f161d428 | 23 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) |
| 7a5af891 JR |
24 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ |
| 25 | + for i in 0.0.0 0.0 0; do \ | |
| 26 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \ | |
| 27 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \ | |
| 554abb27 JB |
28 | + break; \ |
| 29 | + fi; \ | |
| 30 | + done; \ | |
| 31 | + fi | |
| 32 | -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ | |
| 33 | for i in 0.0.0 0.0 0; do \ | |
| 34 | if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ | |
| 35 | --- php-4.3.0/sapi/cgi/Makefile.frag.orig Sun Sep 29 18:22:48 2002 | |
| 36 | +++ php-4.3.0/sapi/cgi/Makefile.frag Thu Jan 2 23:33:29 2003 | |
| 37 | @@ -1,2 +1,2 @@ | |
| 38 | -$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) | |
| 39 | +$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) | |
| 40 | $(BUILD_CGI) | |
| 41 | --- php-4.3.0/sapi/cli/Makefile.frag.orig Sun Sep 29 18:22:48 2002 | |
| 42 | +++ php-4.3.0/sapi/cli/Makefile.frag Thu Jan 2 23:35:16 2003 | |
| 43 | @@ -1,4 +1,4 @@ | |
| 44 | -$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) | |
| 45 | +$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) | |
| 46 | $(BUILD_CLI) | |
| 47 | ||
| 48 | install-cli: $(SAPI_CLI_PATH) |