tng 2002/11/15 13:49:59
Modified: c/obj Makefile.in
Log:
[Bug 13801] cygwin libxerces-c.dll symlinks misleading. Patch from Abe Backus.
Revision Changes Path
1.33 +19 -4 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.in 28 Oct 2002 18:18:18 -0000 1.32
+++ Makefile.in 15 Nov 2002 21:49:59 -0000 1.33
@@ -89,6 +89,9 @@
BATCH_TARGET = "//'${LOADMOD}(IXM4C50)'"
endif
ifneq (${PLATFORM}, OS400)
+ifeq (${PLATFORM}, CYGWIN)
+CYGNAME=cygxerces-c
+endif
LIBNAME=libxerces-c
else
LIBNAME=libxercesc
@@ -149,10 +152,17 @@
${FQ_REAL_NAME}: $(ALL_OBJECTS)
@echo Building ${FQ_REAL_NAME}
${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
+ifeq (${PLATFORM}, CYGWIN)
+ @echo symlink ${FQ_SO_NAME}.a
+ rm -rf ${FQ_SO_NAME}.a && ln -s
${XML_LIB_DIR}/${LIBNAME}${VER}${SHLIBSUFFIX}.a ${FQ_SO_NAME}.a
+ @echo symlink ${FQ_LINK_NAME}.a
+ rm -rf ${FQ_LINK_NAME}.a && ln -s ${FQ_SO_NAME}.a ${FQ_LINK_NAME}.a
+else
@echo symlink ${FQ_SO_NAME}
rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
@echo symlink ${FQ_LINK_NAME}
rm -rf ${FQ_LINK_NAME} && ln -s ${FQ_SO_NAME} ${FQ_LINK_NAME}
+endif
## Start OS390 ##
ifeq (${PLATFORM},OS390)
@@ -178,6 +188,13 @@
-rm -f $(TEMPLATESREPOSITORY)/*.cs
-rm -f $(TEMPLATESREPOSITORY)/*.he
endif
+ifeq (${PLATFORM}, CYGWIN)
+ -rm -f ${FQ_SO_NAME}.a
+ -rm -f ${FQ_LINK_NAME}.a
+else
+ -rm -f ${FQ_SO_NAME}
+ -rm -f ${FQ_LINK_NAME}
+endif
distclean: clean
@@ -197,9 +214,7 @@
-mkdir -p ${DESTDIR}${PREFIX}/bin
$(CP) ${FQ_REAL_NAME} ${DESTDIR}${PREFIX}/bin
$(CP) $(XML_LIB_DIR)/${LIBNAME}${VER}.dll.a ${DESTDIR}${PREFIX}/lib
- rm -rf ${DESTDIR}${PREFIX}/lib/${LIBNAME}.dll.a
${DESTDIR}${PREFIX}/lib/libxerces.dll.a
- ln -s ${DESTDIR}${PREFIX}/lib/${LIBNAME}${VER}.dll.a
${DESTDIR}${PREFIX}/lib/${LIBNAME}.dll.a
- ln -s ${DESTDIR}${PREFIX}/lib/${LIBNAME}${VER}.dll.a
${DESTDIR}${PREFIX}/lib/libxerces.dll.a
+ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LIBNAME}.dll.a libxerces.dll.a; ln -s
${LIBNAME}${VER}.dll.a ${LIBNAME}.dll.a; ln -s ${LIBNAME}${VER}.dll.a libxerces.dll.a)
else
$(CP) ${FQ_REAL_NAME} ${DESTDIR}$(PREFIX)/lib
(cd ${DESTDIR}$(PREFIX)/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME}
${LINK_NAME})
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
