diff --git a/obj/Makefile.in b/obj/Makefile.in
index e83bd3b588f96eb6db31d0653f64a2f87bfd0d60..8d90189a55e65af164e903ab54633201c652e0ea 100644
--- a/obj/Makefile.in
+++ b/obj/Makefile.in
@@ -48,8 +48,9 @@ include ../src/xercesc/Makefile.incl
LIB=${XERCESCROOT}/lib
## OS390BATCH
ifeq (${OS390BATCH},1)
-BATCH_TARGET = "//'${LOADMOD}(IXM4C54)'"
-DEPDOM_TARGET = "//'${LOADMOD}(DDOM54)'"
+BATCH_TARGET = "//'${LOADMOD}(IXM4C55)'"
+BATCH_EXP = "//'${LOADEXP}(IXM4C55)'"
+DEPDOM_TARGET = "//'${LOADMOD}(IXMDD55)'"
endif
ifneq (${PLATFORM}, OS400)
ifeq (${PLATFORM}, CYGWIN)
@@ -148,6 +149,9 @@ 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},OS390)
+ $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${LIB}
+ endif
ifneq (${FQ_SO_NAME},${FQ_REAL_NAME})
@echo symlink ${FQ_SO_NAME}
rm -rf ${FQ_SO_NAME} && ln -s ${FQ_REAL_NAME} ${FQ_SO_NAME}
@@ -162,8 +166,13 @@ ifeq (${PLATFORM},SOLARIS)
cp $(DEPDOM_OBJECTS) $(PLATFORM)
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${DEPDOM_OBJS} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
rm ${DEPDOM_OBJS}
+else
+ifeq (${PLATFORM},OS390)
+ ${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) ${LIB}/${LIBNAME}${VER}${OS390SIDEDECK}
+ $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${LIB}
else
${MAKE_SHARED} ${LD_SODEPDOM} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
+endif
endif
ifneq (${FQ_SO_DEPDOM},${FQ_REAL_DEPDOM})
@echo symlink ${FQ_SO_DEPDOM}
@@ -181,9 +190,7 @@ ${BATCH_TARGET}: $(ALL_OBJECTS)
${MAKE_SHARED} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
${DEPDOM_TARGET}: $(DEPDOM_OBJECTS)
@echo Building ${DEPDOM_TARGET}
- ${MAKE_SHARED} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
-else
- $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${LIB}
+ ${MAKE_SHARED} -o ${@} ${^} $(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) $(BATCH_EXP)
endif
endif
diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index c2bdad3689ade2c09ac6998d47b0362fb20cbf80..46321d8e374a3a8c1a335d530bdd51568e852608 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -290,7 +290,7 @@ endif
# export LOADMOD=USERID.LOAD #
# export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP #
# #
-# to specify your LOADMOD and the IXM4C54X definition sidedeck #
+# to specify your LOADMOD and the IXM4C55X definition sidedeck #
# dataset. #
###################################################################
@@ -309,7 +309,7 @@ SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C54X)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C55X)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index 9aa821db2c2f67b81293ce578d06eea495d26de2..ccd0b5d6fa38a2ea0b39d5295c4054d4ab60cc07 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -536,7 +536,7 @@ MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -W l,dll ${LDFLAGS}
ifeq (${TRANSCODER}, ICU)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXM30UCX)'"
+ ALLLIBS = "//'${LOADEXP}(IXMI30UC)'"
else
ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x
endif
@@ -544,7 +544,7 @@ else
ifeq (${TRANSCODER}, Uniconv390)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXM30UCX)'"
+ ALLLIBS = "//'${LOADEXP}(IXMI30UC)'"
else
ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x
endif
diff --git a/src/xercesc/util/Transcoders/Uniconv390/ascii.s b/src/xercesc/util/Transcoders/Uniconv390/ascii.s
index d711602a18687a72cc26dff28f6198086a1b16df..213010018f43ff86d16d5f602580a81105f30e4a 100644
--- a/src/xercesc/util/Transcoders/Uniconv390/ascii.s
+++ b/src/xercesc/util/Transcoders/Uniconv390/ascii.s
@@ -9,13 +9,16 @@
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* permissions and limitations under the License.
*
*
* $Log$
+* Revision 1.3 2004/09/17 09:58:09 cargilld
+* Updates to build on OS390 from Steve Dulin.
+*
* Revision 1.2 2004/09/08 13:56:46 peiyongz
* Apache License Version 2.0
*
diff --git a/src/xercesc/util/Transcoders/Uniconv390/trot.s b/src/xercesc/util/Transcoders/Uniconv390/trot.s
index d60bae73457c9dcc8acd7451aab3cc04580a267d..f96909665f86b777463cdfc5019863be64656bfa 100644
--- a/src/xercesc/util/Transcoders/Uniconv390/trot.s
+++ b/src/xercesc/util/Transcoders/Uniconv390/trot.s
@@ -9,13 +9,16 @@
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* permissions and limitations under the License.
*
*
* $Log$
+* Revision 1.3 2004/09/17 09:58:09 cargilld
+* Updates to build on OS390 from Steve Dulin.
+*
* Revision 1.2 2004/09/08 13:56:46 peiyongz
* Apache License Version 2.0
*
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index a7ceca7998cdbbd173974b6662199e2169a8cc0a..18a7e21eef888e10a8386195038f8a9c2fa3a044 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -290,7 +290,7 @@ endif
# export LOADMOD=USERID.LOAD #
# export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP #
# #
-# to specify your LOADMOD and the IXM4C54X definition sidedeck #
+# to specify your LOADMOD and the IXM4C55X definition sidedeck #
# dataset. #
###################################################################
@@ -304,14 +304,16 @@ CC = _CXX_CXXSUFFIX="cpp" c++ -W0,"langlvl(extended)" -Wc,"TMPLPARSE(NO)" -DOS39
endif
LINK = ${CC} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=
-EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
+EXTRA_LINK_OPTIONS=
SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C54X)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C55X)'"
+LIBRARY_DEPDOM="//'${LOADEXP}(IXMDD55X)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
+LIBRARY_DEPDOM=${LIB_DIR}/lib${LIBDEPDOM}${VER}${OS390SIDEDECK}
endif
LIBRARY_SEARCH_PATHS=
endif