1 diff -ur php-4.1.2/Makefile.in php-4.1.2.x/Makefile.in
2 --- php-4.1.2/Makefile.in Sun Apr 22 03:09:12 2001
3 +++ php-4.1.2.x/Makefile.in Sat Mar 2 23:05:56 2002
5 ZEND_DIR = $(srcdir)/Zend
6 SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
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
16 +libphp4_la_DEPENDENCIES = \
18 + sapi/$(PHP_SAPI)/libsapi.la
20 -LTLIBRARY_DEPENDENCIES = \
22 +libphp_common_la_DEPENDENCIES = \
24 - sapi/$(PHP_SAPI)/libsapi.la \
30 -LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
31 -LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
32 +libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
33 +libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
36 PROGRAM_SOURCES = stub.c
37 -PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD)
38 +PROGRAM_LDADD = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD)
39 PROGRAM_LDFLAGS = -export-dynamic
40 PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
42 -targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
43 +targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM)
45 install_targets = install-sapi install-modules
47 include $(top_srcdir)/build/rules.mk
48 -include $(top_srcdir)/build/library.mk
49 include $(top_srcdir)/build/program.mk
51 +libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release $(PHP_VERSION) -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
52 +libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
54 +libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
56 +$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
57 + $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD)
59 +libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X)
61 +$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES)
62 + $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD)
65 - @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
66 + @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
67 + @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
68 -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
69 -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
70 for i in 0.0.0 0.0 0; do \
71 if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
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 $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \