You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2002/04/09 18:42:01 UTC
cvs commit: xml-xerces/c/src/xercesc Makefile.incl Makefile.in
peiyongz 02/04/09 09:42:01
Modified: c/src/xercesc Makefile.incl Makefile.in
Log:
Bug#6095: build versioned shared library
Revision Changes Path
1.5 +49 -4 xml-xerces/c/src/xercesc/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.incl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.incl 27 Feb 2002 22:38:23 -0000 1.4
+++ Makefile.incl 9 Apr 2002 16:42:01 -0000 1.5
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.4 2002/02/27 22:38:23 peiyongz Exp $
+# $Id: Makefile.incl,v 1.5 2002/04/09 16:42:01 peiyongz Exp $
#
###################################################################
@@ -104,6 +104,10 @@
endif
TO = o
RM2 = rm -f
+## Compiler switch to embed a library name
+## default value empty
+LD_SONAME =
+
####################### PLATFORM DEPENDENCIES #####################
#=============== SOLARIS SPECIFIC OPTIONS =========================
@@ -131,6 +135,8 @@
endif
endif
SHLIBSUFFIX=.so
+ ## Compiler switch to embed a library name
+ LD_SONAME = -h ${SO_NAME}
endif
#=============== UNIXWARE SPECIFIC OPTIONS =========================
@@ -225,8 +231,12 @@
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE
MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS}
MAKE_SHARED_C = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS}
-EXTRA_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBNAME}${VER}.map
-SHLIBSUFFIX=.a
+
+EXTRA_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map
+SHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME =
+
endif
#================= OS400 SPECIFIC OPTIONS ==========================
@@ -277,8 +287,10 @@
else
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc
endif
-EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${LIBNAME}${VER}.map
+EXTRA_LINK_OPTIONS = -Xlinker -Map -Xlinker $(XML_OBJ)/${SO_NAME}.map
SHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname,${SO_NAME}
endif
#=============== FREEBSD SPECIFIC OPTIONS =========================
@@ -365,6 +377,8 @@
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,-a,shared
SHLIBSUFFIX=.sl
endif
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,+h,${SO_NAME}
endif
@@ -437,6 +451,37 @@
SHLIBSUFFIX=.dylib
endif
+#
+#
+#
+ifeq (${PLATFORM}, AIX)
+
+ #
+ # LINK_NAME=libxerces-c.so
+ # SO_NAME =libxerces-c17.so
+ # REAL_NAME=libxerces-c17.0.so
+ #
+
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+
+else
+
+ #
+ # LINK_NAME=libxerces-c.so
+ # SO_NAME =libxerces-c.so.17
+ # REAL_NAME=libxerces-c.so.17.0
+ #
+ LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
+ SO_NAME =${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
+ REAL_NAME=${LIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+
+endif
+
+FQ_LINK_NAME=${XML_LIB_DIR}/${LINK_NAME}
+FQ_SO_NAME =${XML_LIB_DIR}/${SO_NAME}
+FQ_REAL_NAME=${XML_LIB_DIR}/${REAL_NAME}
###################### STANDARD TOOLS #############################
ifeq (${PLATFORM}, OS400)
1.3 +4 -5 xml-xerces/c/src/xercesc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 11 Feb 2002 18:19:19 -0000 1.2
+++ Makefile.in 9 Apr 2002 16:42:01 -0000 1.3
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.2 2002/02/11 18:19:19 tng Exp $
+# $Id: Makefile.in,v 1.3 2002/04/09 16:42:01 peiyongz Exp $
#
###################################################################
@@ -88,7 +88,6 @@
VALIDATORS_DIR = validators
LIBNAME = libxerces-c
-THISLIB = ${XML_LIB_DIR}/${LIBNAME}
#all these setting come from the arguments passed in to runConfigure.
PLATFORM = @platform@
@@ -106,7 +105,7 @@
compile:: Prepare Util Sax Internal Framework Parsers Sax2 Dom IDom Validators
-lib:: ${THISLIB}${VER}${SHLIBSUFFIX}
+lib:: ${FQ_REAL_NAME}
Prepare::
@echo Preparing the directory structure for a build ...
@@ -159,8 +158,8 @@
@echo Building "validators"
${MAKE} -C $(VALIDATORS_DIR) $(MAKE_FLAGS)
-${THISLIB}${VER}${SHLIBSUFFIX}:: compile
- @echo Building ${THISLIB}${VER}${SHLIBSUFFIX}
+${FQ_REAL_NAME}:: compile
+ @echo Building ${FQ_REAL_NAME}
${MAKE} -C $(XML_OBJ_DIR)/.. -k $(MAKE_FLAGS)
install::
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org