]>
Commit | Line | Data |
---|---|---|
7a5af891 JR |
1 | diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in |
2 | --- php-4.0.5.orig/Makefile.in Sun May 6 23:07:47 2001 | |
3 | +++ php-4.0.5/Makefile.in Mon May 7 03:25:53 2001 | |
4 | @@ -2,41 +2,68 @@ | |
5 | ZEND_DIR = $(srcdir)/Zend | |
6 | SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) | |
7 | ||
8 | -LTLIBRARY_NAME = libphp4.la | |
9 | -LTLIBRARY_SOURCES = stub.c | |
10 | +libexec_LTLIBRARIES = libphp_common.la libphp4.la | |
11 | +libphp4_la_NAME = libphp4.la | |
12 | +libphp_common_la_NAME = libphp_common.la | |
13 | +libphp4_la_SOURCES = stub.c | |
14 | +libphp_la_common_SOURCES = stub.c | |
15 | + | |
16 | +libphp4_la_DEPENDENCIES = \ | |
17 | + libphp_common.la \ | |
18 | + sapi/$(PHP_SAPI)/libsapi.la | |
19 | ||
20 | -LTLIBRARY_DEPENDENCIES = \ | |
21 | +libphp_common_la_DEPENDENCIES = \ | |
22 | Zend/libZend.la \ | |
23 | - sapi/$(PHP_SAPI)/libsapi.la \ | |
24 | main/libmain.la \ | |
25 | $(REGEX_LIB) \ | |
26 | $(EXT_LTLIBS) \ | |
27 | $(TSRM_LIB) | |
28 | ||
29 | -LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) | |
30 | -LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) | |
31 | +libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) | |
32 | +libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS) | |
33 | + | |
34 | +libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release 4.0.5 -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS) | |
35 | +libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS) | |
36 | ||
37 | PROGRAM_NAME = php | |
38 | PROGRAM_SOURCES = stub.c | |
39 | -PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) | |
40 | +PROGRAM_LDADD = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD) | |
41 | PROGRAM_LDFLAGS = -export-dynamic | |
42 | PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) | |
43 | ||
44 | -targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) | |
45 | +targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM) | |
46 | ||
47 | install_targets = install-sapi install-modules | |
48 | ||
49 | include $(top_srcdir)/build/rules.mk | |
50 | -include $(top_srcdir)/build/library.mk | |
51 | include $(top_srcdir)/build/program.mk | |
52 | ||
53 | +libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X) | |
54 | + | |
55 | +$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES) | |
56 | + $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD) | |
57 | + | |
58 | +libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X) | |
59 | + | |
60 | +$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES) | |
61 | + $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD) | |
62 | + | |
63 | install-sapi: | |
64 | - @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 | |
65 | + @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la | |
66 | + @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la | |
67 | -@$(mkinstalldirs) $(DESTDIR)$(bindir) | |
68 | -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ | |
69 | for i in 0.0.0 0.0 0; do \ | |
70 | if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ | |
71 | $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ | |
72 | + break; \ | |
73 | + fi; \ | |
74 | + done; \ | |
75 | + fi | |
76 | + -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ | |
77 | + for i in 0.0.0 0.0 0; do \ | |
78 | + if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \ | |
79 | + $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \ | |
80 | break; \ | |
81 | fi; \ | |
82 | done; \ |