peiyongz 2004/07/08 13:51:44 Modified: c/src/xercesc Makefile.in Makefile.incl Log: build ICU3.0 Revision Changes Path 1.20 +37 -37 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Makefile.in 17 Mar 2004 21:22:02 -0000 1.19 +++ Makefile.in 8 Jul 2004 20:51:44 -0000 1.20 @@ -252,44 +252,44 @@ -${CP} -Rf ${XERCESCROOT}/lib/${REAL_NAME} ${BINTARGETDIR}/lib -${CD} ${BINTARGETDIR}/lib; ln -s ${REAL_NAME} ${SO_NAME}; ln -s ${REAL_NAME} ${LINK_NAME} ifeq (${TRANSCODER},ICU) - -${CP} -Rf ${ICUROOT}/lib/libicudata26.1.so ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicudata.so.26.1 ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.26.1 ${BINTARGETDIR}/lib - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata26.1.so' -exec ln -s {} libicudata.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata26.1.so' -exec ln -s {} libicudata26.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.26.1' -exec ln -s {} libicudata.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.26.1' -exec ln -s {} libicudata.so.26 \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.26.1' -exec ln -s {} libicudata.sl \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.26.1' -exec ln -s {} libicudata.sl.26 \; - -${CP} -Rf ${ICUROOT}/lib/libicuuc26.1.so ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.26.1 ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.26.1 ${BINTARGETDIR}/lib - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc26.1.so' -exec ln -s {} libicuuc.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc26.1.so' -exec ln -s {} libicuuc26.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.26.1' -exec ln -s {} libicuuc.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.26.1' -exec ln -s {} libicuuc.so.26 \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.26.1' -exec ln -s {} libicuuc.sl \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.26.1' -exec ln -s {} libicuuc.sl.26 \; + -${CP} -Rf ${ICUROOT}/lib/libicudata30.0.so ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicudata.so.30.0 ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.30.0 ${BINTARGETDIR}/lib + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata30.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so.30 \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl.30 \; + -${CP} -Rf ${ICUROOT}/lib/libicuuc30.0.so ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.30.0 ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.30.0 ${BINTARGETDIR}/lib + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc30.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so.30 \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl.30 \; else ifeq (${MESSAGELOADER},ICU) - -${CP} -Rf ${ICUROOT}/lib/libicudata26.1.so ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicudata.so.26.1 ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.26.1 ${BINTARGETDIR}/lib - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata26.1.so' -exec ln -s {} libicudata.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata26.1.so' -exec ln -s {} libicudata26.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.26.1' -exec ln -s {} libicudata.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.26.1' -exec ln -s {} libicudata.so.26 \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.26.1' -exec ln -s {} libicudata.sl \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.26.1' -exec ln -s {} libicudata.sl.26 \; - -${CP} -Rf ${ICUROOT}/lib/libicuuc26.1.so ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.26.1 ${BINTARGETDIR}/lib - -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.26.1 ${BINTARGETDIR}/lib - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc26.1.so' -exec ln -s {} libicuuc.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc26.1.so' -exec ln -s {} libicuuc26.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.26.1' -exec ln -s {} libicuuc.so \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.26.1' -exec ln -s {} libicuuc.so.26 \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.26.1' -exec ln -s {} libicuuc.sl \; - -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.26.1' -exec ln -s {} libicuuc.sl.26 \; + -${CP} -Rf ${ICUROOT}/lib/libicudata30.0.so ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicudata.so.30.0 ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicudata.sl.30.0 ${BINTARGETDIR}/lib + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata30.0.so' -exec ln -s {} libicudata30.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.30.0' -exec ln -s {} libicudata.so.30 \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.30.0' -exec ln -s {} libicudata.sl.30 \; + -${CP} -Rf ${ICUROOT}/lib/libicuuc30.0.so ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicuuc.so.30.0 ${BINTARGETDIR}/lib + -${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.30.0 ${BINTARGETDIR}/lib + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc30.0.so' -exec ln -s {} libicuuc30.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.30.0' -exec ln -s {} libicuuc.so.30 \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl \; + -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.30.0' -exec ln -s {} libicuuc.sl.30 \; endif endif ifeq (${MESSAGELOADER},ICU) 1.55 +8 -8 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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- Makefile.incl 19 May 2004 14:49:15 -0000 1.54 +++ Makefile.incl 8 Jul 2004 20:51:44 -0000 1.55 @@ -244,13 +244,13 @@ #endif ifeq (${TRANSCODER}, ICU) - ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc26 -licudata26 + ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30 else ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib endif ifeq (${MESSAGELOADER}, ICU) - ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc26 -licudata26 -lXercesMessages25 + ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30 -lXercesMessages25 endif PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE @@ -267,7 +267,7 @@ DEPDOM_LINK_OPTIONS = -bmap:$(XML_OBJ)/${LIBDEPDOM}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map SHLIBSUFFIX=.a -ICUSHLIBSUFFIX=.so +ICUSHLIBSUFFIX=.a ## Compiler switch to embed a library name LD_SONAME = @@ -561,17 +561,17 @@ ifeq (${TRANSCODER}, ICU) ## OS390BATCH ifeq (${OS390BATCH},1) - ALLLIBS = "//'${LOADEXP}(IXM26UCX)'" + ALLLIBS = "//'${LOADEXP}(IXM30UCX)'" else - ALLLIBS = ${ICUROOT}/lib/libicuuc26.1.x + ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x endif else ifeq (${TRANSCODER}, Uniconv390) ## OS390BATCH ifeq (${OS390BATCH},1) - ALLLIBS = "//'${LOADEXP}(IXM26UCX)'" + ALLLIBS = "//'${LOADEXP}(IXM30UCX)'" else - ALLLIBS = ${ICUROOT}/lib/libicuuc26.1.x + ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x endif else ALLLIBS =
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]