peiyongz 2003/11/19 15:06:01
Modified: c/src/xercesc Makefile.incl Makefile.in configure.in
Log:
build xercesc2_4_0, build w/o -brtl on AIX
Revision Changes Path
1.44 +28 -10 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.incl 20 Aug 2003 08:53:51 -0000 1.43
+++ Makefile.incl 19 Nov 2003 23:06:00 -0000 1.44
@@ -235,23 +235,23 @@
#endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc24 -licudata24
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc26 -licudata26
else
ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib
endif
ifeq (${MESSAGELOADER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc24 -licudata24 -lXercesMessages23
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc26 -licudata26 -lXercesMessages24
endif
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE
ifeq (${BITSTOBUILD}, 64)
- MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS} -X64
- MAKE_SHARED_C = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS} -X64
+ MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS} -X64
+ MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS} -X64
else
- MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS}
- MAKE_SHARED_C = makeC++SharedLib_r -p 5000 -brtl ${LDFLAGS}
+ MAKE_SHARED = makeC++SharedLib_r -p 5000 ${LDFLAGS}
+ MAKE_SHARED_C = makeC++SharedLib_r -p 5000 ${LDFLAGS}
endif
EXTRA_LINK_OPTIONS =
-bmap:$(XML_OBJ)/${LIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.map
@@ -506,7 +506,7 @@
ifeq (${OS390BATCH},1)
ALLLIBS = "//'${LOADEXP}(IXM24UCX)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicuuc24.0.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc26.1.x
endif
else
ifeq (${TRANSCODER}, Uniconv390)
@@ -514,7 +514,7 @@
ifeq (${OS390BATCH},1)
ALLLIBS = "//'${LOADEXP}(IXM24UCX)'"
else
- ALLLIBS = ${ICUROOT}/lib/libicuuc24.0.x
+ ALLLIBS = ${ICUROOT}/lib/libicuuc26.1.x
endif
else
ALLLIBS =
@@ -607,7 +607,12 @@
RESLIB_LINK_NAME=${RESLIBNAME}${SHLIBSUFFIX}
RESLIB_SO_NAME =${RESLIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
-
RESLIB_REAL_NAME=${RESLIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+
RESLIB_REAL_NAME=${RESLIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}${SHLIBSUFFIX}
+
+ RESLIB_LINK_DOTA=${RESLIBNAME}.a
+ RESLIB_SO_DOTA =${RESLIBNAME}${SO_TARGET_VERSION}.a
+ RESLIB_REAL_DOTA=${RESLIBNAME}${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}.a
+
endif
ifeq (${PLATFORM}, OS390)
#
@@ -622,6 +627,11 @@
RESLIB_LINK_NAME=${RESLIBNAME}${SHLIBSUFFIX}
RESLIB_SO_NAME =${RESLIBNAME}${SO_TARGET_VERSION}${SHLIBSUFFIX}
RESLIB_REAL_NAME=${RESLIBNAME}${VER}${SHLIBSUFFIX}
+
+ RESLIB_LINK_DOTA=${RESLIBNAME}.a
+ RESLIB_SO_DOTA =${RESLIBNAME}${SO_TARGET_VERSION}.a
+ RESLIB_REAL_DOTA=${RESLIBNAME}${VER}.a
+
endif
ifeq (${PLATFORM}, CYGWIN)
#
@@ -668,6 +678,10 @@
RESLIB_LINK_NAME=${RESLIBNAME}${SHLIBSUFFIX}
RESLIB_SO_NAME =${RESLIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}
RESLIB_REAL_NAME=${RESLIBNAME}${SHLIBSUFFIX}.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
+
+ RESLIB_LINK_DOTA=${RESLIBNAME}.a
+ RESLIB_SO_DOTA =${RESLIBNAME}.a.${SO_TARGET_VERSION}
+
RESLIB_REAL_DOTA=${RESLIBNAME}.a.${SO_TARGET_VERSION}.${SO_TARGET_VERSION_MAJOR}
endif
@@ -678,6 +692,10 @@
FQ_RESLIB_LINK_NAME=${XML_LIB_DIR}/${RESLIB_LINK_NAME}
FQ_RESLIB_SO_NAME =${XML_LIB_DIR}/${RESLIB_SO_NAME}
FQ_RESLIB_REAL_NAME=${XML_LIB_DIR}/${RESLIB_REAL_NAME}
+
+FQ_RESLIB_LINK_DOTA=${XML_LIB_DIR}/${RESLIB_LINK_DOTA}
+FQ_RESLIB_SO_DOTA =${XML_LIB_DIR}/${RESLIB_SO_DOTA}
+FQ_RESLIB_REAL_DOTA=${XML_LIB_DIR}/${RESLIB_REAL_DOTA}
###################### STANDARD TOOLS #############################
ifeq (${PLATFORM}, OS400)
1.15 +13 -13 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 14 Jul 2003 18:47:24 -0000 1.14
+++ Makefile.in 19 Nov 2003 23:06:00 -0000 1.15
@@ -251,40 +251,40 @@
-${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/libicudata24.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata26.1.so ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicudata.so.24.0 ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicudata.sl.24.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata24.0.so' -exec ln -s {}
libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata24.0.so' -exec ln -s {}
libicudata24.so \;
+ -${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.24.0' -exec ln -s {}
libicudata.so \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.24.0' -exec ln -s {}
libicudata.so.24 \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.24.0' -exec ln -s {}
libicudata.sl \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.24.0' -exec ln -s {}
libicudata.sl.24 \;
- -${CP} -Rf ${ICUROOT}/lib/libicuuc24.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc26.1.so ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicuuc.so.24.0 ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.24.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc24.0.so' -exec ln -s {}
libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc24.0.so' -exec ln -s {}
libicuuc24.so \;
+ -${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.24.0' -exec ln -s {}
libicuuc.so \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.24.0' -exec ln -s {}
libicuuc.so.24 \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.24.0' -exec ln -s {}
libicuuc.sl \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.24.0' -exec ln -s {}
libicuuc.sl.24 \;
else
ifeq (${MESSAGELOADER},ICU)
- -${CP} -Rf ${ICUROOT}/lib/libicudata24.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicudata26.1.so ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicudata.so.24.0 ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicudata.sl.24.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata24.0.so' -exec ln -s {}
libicudata.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata24.0.so' -exec ln -s {}
libicudata24.so \;
+ -${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.24.0' -exec ln -s {}
libicudata.so \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.so.24.0' -exec ln -s {}
libicudata.so.24 \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.24.0' -exec ln -s {}
libicudata.sl \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicudata.sl.24.0' -exec ln -s {}
libicudata.sl.24 \;
- -${CP} -Rf ${ICUROOT}/lib/libicuuc24.0.so ${BINTARGETDIR}/lib
+ -${CP} -Rf ${ICUROOT}/lib/libicuuc26.1.so ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicuuc.so.24.0 ${BINTARGETDIR}/lib
-${CP} -Rf ${ICUROOT}/lib/libicuuc.sl.24.0 ${BINTARGETDIR}/lib
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc24.0.so' -exec ln -s {}
libicuuc.so \;
- -${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc24.0.so' -exec ln -s {}
libicuuc24.so \;
+ -${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.24.0' -exec ln -s {}
libicuuc.so \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.so.24.0' -exec ln -s {}
libicuuc.so.24 \;
-${CD} ${BINTARGETDIR}/lib; find . -name 'libicuuc.sl.24.0' -exec ln -s {}
libicuuc.sl \;
1.19 +1 -1 xml-xerces/c/src/xercesc/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 16 Sep 2003 14:33:36 -0000 1.18
+++ configure.in 19 Nov 2003 23:06:00 -0000 1.19
@@ -2,7 +2,7 @@
AC_INIT(util/XercesDefs.hpp)
dnl AC_CONFIG_HEADER(common/icucfg.h)
-dnl AM_INIT_AUTOMAKE(xerces-c,2.3.0)
+dnl AM_INIT_AUTOMAKE(xerces-c,2.4.0)
dnl Checks for programs
AC_PROG_CC
AC_PROG_CXX
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
