dbertoni 2003/07/30 18:06:46
Modified: c/src/xalanc Makefile.in
Log:
More changes for bug 13238.
Revision Changes Path
1.15 +4 -3 xml-xalan/c/src/xalanc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 29 Jul 2003 23:09:11 -0000 1.14
+++ Makefile.in 31 Jul 2003 01:06:46 -0000 1.15
@@ -174,6 +174,7 @@
LIBKEYNAME=${PROJECT_NAME}${LIBMAJORVER}
else
LIB = ${LIBNAME}$(SHLIBSUFFIX).${LIBMAJORVER}.${LIBMINORVER}
+ SONAME = ${LIBNAME}${SHLIBSUFFIX}.${LIBMAJORVER}
endif ## AIX
endif ## OS390
THISLIB = ${LIB_DIR}/${LIB}
@@ -225,7 +226,7 @@
EXTRA_LINK_OPTIONS=
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,-soname,$(LIB) -D${PLATFORM} -shared
${PIC_OPTION}
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,-soname,$(SONAME) -D${PLATFORM}
-shared ${PIC_OPTION}
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION}
endif
@@ -295,7 +296,7 @@
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
$(PLATFORM_CXX_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
+ MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s -Wl,+h,${SONAME}
LINK = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS)
$(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
endif
@@ -328,7 +329,7 @@
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
CC4 = $(CC) $(CXXFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
-h ${SONAME}
MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
LINK = ${CXX} -D${PLATFORM} -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
