tng 2002/12/02 10:45:19
Modified: c/src/xercesc Makefile.incl
Log:
[Bug 13801] cygwin libxerces-c.dll symlinks misleading. Patch from Abe Backus.
Revision Changes Path
1.30 +10 -7 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.incl 22 Nov 2002 14:54:45 -0000 1.29
+++ Makefile.incl 2 Dec 2002 18:45:19 -0000 1.30
@@ -515,9 +515,12 @@
endif
EXTRA_LINK_OPTIONS = \
-Xlinker --warn-once \
- -Xlinker -Map -Xlinker $(XML_LIB_DIR)/${LIBNAME}${VER}.map \
- -Xlinker --output-def -Xlinker $(XML_LIB_DIR)/${LIBNAME}${VER}.def \
- -Xlinker --out-implib -Xlinker $(XML_LIB_DIR)/${LIBNAME}${VER}.dll.a
+ -Xlinker -Map \
+ -Xlinker $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}.map \
+ -Xlinker --output-def \
+ -Xlinker $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}.def \
+ -Xlinker --out-implib \
+ -Xlinker $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}.dll.a
SHLIBSUFFIX=.dll
endif
@@ -551,12 +554,12 @@
ifeq (${PLATFORM}, CYGWIN)
#
# LINK_NAME=libxerces-c.dll
- # SO_NAME =libxerces-c20.dll
+ # SO_NAME =cygxerces-c20.dll
# REAL_NAME=libxerces-c2_0_0.dll
#
LINK_NAME=${LIBNAME}${SHLIBSUFFIX}
- SO_NAME =${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
- REAL_NAME=${CYGNAME}${VER}${SHLIBSUFFIX}
+ SO_NAME =${CYGNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
+ REAL_NAME=${LIBNAME}${VER}${SHLIBSUFFIX}
else
#
# LINK_NAME=libxerces-c.so
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
