tng 2002/12/02 10:44:57
Modified: c/obj Makefile.in
Log:
[Bug 13801] cygwin libxerces-c.dll symlinks misleading. Patch from Abe Backus.
Revision Changes Path
1.34 +20 -12 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.in 15 Nov 2002 21:49:59 -0000 1.33
+++ Makefile.in 2 Dec 2002 18:44:57 -0000 1.34
@@ -133,7 +133,11 @@
all: ${BATCH_TARGET}
## End OS390BATCH ##
else
+ ifeq (${PLATFORM},CYGWIN)
+all: ${FQ_SO_NAME}
+ else
all: ${FQ_REAL_NAME}
+ endif
endif
endif
@@ -149,20 +153,23 @@
# link your application. #
########################################################
+ifeq (${PLATFORM},CYGWIN)
+${FQ_SO_NAME}: $(ALL_OBJECTS)
+ @echo Building ${FQ_SO_NAME}
+ ${MAKE_SHARED} ${LD_SONAME} -o ${@} ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
+ @echo symlink ${FQ_REAL_NAME}.a
+ rm -rf ${FQ_REAL_NAME}.a && ln -s
${XML_LIB_DIR}/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${FQ_REAL_NAME}.a
+ @echo symlink ${FQ_LINK_NAME}.a
+ rm -rf ${FQ_LINK_NAME}.a && ln -s ${FQ_REAL_NAME}.a ${FQ_LINK_NAME}.a
+endif
+
${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)
@@ -189,8 +196,9 @@
-rm -f $(TEMPLATESREPOSITORY)/*.he
endif
ifeq (${PLATFORM}, CYGWIN)
- -rm -f ${FQ_SO_NAME}.a
+ -rm -f ${XML_LIB_DIR}/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
-rm -f ${FQ_LINK_NAME}.a
+ -rm -f ${FQ_REAL_NAME}.a
else
-rm -f ${FQ_SO_NAME}
-rm -f ${FQ_LINK_NAME}
@@ -212,9 +220,9 @@
-mkdir -p ${DESTDIR}${PREFIX}/lib
ifeq (${PLATFORM}, CYGWIN)
-mkdir -p ${DESTDIR}${PREFIX}/bin
- $(CP) ${FQ_REAL_NAME} ${DESTDIR}${PREFIX}/bin
- $(CP) $(XML_LIB_DIR)/${LIBNAME}${VER}.dll.a ${DESTDIR}${PREFIX}/lib
- (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)
+ $(CP) ${FQ_SO_NAME} ${DESTDIR}${PREFIX}/bin
+ $(CP) $(XML_LIB_DIR)/${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${DESTDIR}${PREFIX}/lib
+ (cd ${DESTDIR}$(PREFIX)/lib; rm -f ${LINK_NAME}.a libxerces.dll.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a ${LINK_NAME}.a; ln -s
${LIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}.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]
