cargilld 2004/09/17 02:58:09
Modified: c/obj Makefile.in
c/samples Makefile.incl
c/src/xercesc Makefile.incl
c/src/xercesc/util/Transcoders/Uniconv390 ascii.s trot.s
c/tests Makefile.incl
Log:
Updates to build on OS390 from Steve Dulin.
Revision Changes Path
1.43 +13 -6 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.in 8 Sep 2004 13:55:30 -0000 1.42
+++ Makefile.in 17 Sep 2004 09:58:09 -0000 1.43
@@ -48,8 +48,9 @@
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 @@
${FQ_REAL_NAME}: $(ALL_OBJECTS)
@echo Building ${FQ_REAL_NAME}
${MAKE_SHARED} ${LD_SONAME} -o [EMAIL PROTECTED] ${^} $(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}
@@ -163,8 +167,13 @@
${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${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 [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
${LIB}/${LIBNAME}${VER}${OS390SIDEDECK}
+ $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${LIB}
+else
${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^} $(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}
rm -rf ${FQ_SO_DEPDOM} && ln -s ${FQ_REAL_DEPDOM} ${FQ_SO_DEPDOM}
@@ -181,9 +190,7 @@
${MAKE_SHARED} -o [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
${DEPDOM_TARGET}: $(DEPDOM_OBJECTS)
@echo Building ${DEPDOM_TARGET}
- ${MAKE_SHARED} -o [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) -L${LIB} -l${LINK_LIBNAME}
-else
- $(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${LIB}
+ ${MAKE_SHARED} -o [EMAIL PROTECTED] ${^} $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS) $(BATCH_EXP)
endif
endif
1.65 +3 -3 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.incl 8 Sep 2004 13:55:30 -0000 1.64
+++ Makefile.incl 17 Sep 2004 09:58:09 -0000 1.65
@@ -290,7 +290,7 @@
# 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 @@
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C54X)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C55X)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
1.61 +3 -3 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile.incl 9 Sep 2004 23:43:17 -0000 1.60
+++ Makefile.incl 17 Sep 2004 09:58:09 -0000 1.61
@@ -536,7 +536,7 @@
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 @@
ifeq (${TRANSCODER}, Uniconv390)
## OS390BATCH
ifeq (${OS390BATCH},1)
- ALLLIBS = "//'${LOADEXP}(IXM30UCX)'"
+ ALLLIBS = "//'${LOADEXP}(IXMI30UC)'"
else
ALLLIBS = ${ICUROOT}/lib/libicuuc30.0.x
endif
1.3 +6 -3 xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/ascii.s
Index: ascii.s
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/ascii.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ascii.s 8 Sep 2004 13:56:46 -0000 1.2
+++ ascii.s 17 Sep 2004 09:58:09 -0000 1.3
@@ -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
*
1.3 +6 -3 xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/trot.s
Index: trot.s
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/trot.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trot.s 8 Sep 2004 13:56:46 -0000 1.2
+++ trot.s 17 Sep 2004 09:58:09 -0000 1.3
@@ -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
*
1.48 +6 -4 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.incl 8 Sep 2004 13:57:02 -0000 1.47
+++ Makefile.incl 17 Sep 2004 09:58:09 -0000 1.48
@@ -290,7 +290,7 @@
# 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 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
