cargilld 2005/05/18 09:27:39
Modified: c/obj Makefile.in
c/samples Makefile.incl
c/tests Makefile.incl
Log:
OS390 updates from Steve Dulin.
Revision Changes Path
1.45 +4 -4 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.in 5 Apr 2005 09:21:56 -0000 1.44
+++ Makefile.in 18 May 2005 16:27:39 -0000 1.45
@@ -48,9 +48,9 @@
LIB=${XERCESCROOT}/lib
## OS390BATCH
ifeq (${OS390BATCH},1)
-BATCH_TARGET = "//'${LOADMOD}(IXM4C55)'"
-BATCH_EXP = "//'${LOADEXP}(IXM4C55)'"
-DEPDOM_TARGET = "//'${LOADMOD}(IXMDD55)'"
+BATCH_TARGET = "//'${LOADMOD}(IXM4C56)'"
+BATCH_EXP = "//'${LOADEXP}(IXM4C56)'"
+DEPDOM_TARGET = "//'${LOADMOD}(IXMDD56)'"
endif
ALL_OBJECTS=$(wildcard $(PLATFORM)/*.o)
1.70 +18 -5 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Makefile.incl 2 Feb 2005 16:41:50 -0000 1.69
+++ Makefile.incl 18 May 2005 16:27:39 -0000 1.70
@@ -309,26 +309,39 @@
# export LOADMOD=USERID.LOAD #
# export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP #
# #
-# to specify your LOADMOD and the IXM4C55X definition sidedeck #
+# to specify your LOADMOD and the IXM4C56X definition sidedeck #
# dataset. #
###################################################################
ifeq (${PLATFORM}, OS390)
-CMP= -c -DOS390 ${CXXFLAGS}
+ifeq (${OS390_XPLINK},1)
+XPLINK_CCOPTS=-Wc,'XPLINK'
+XPLINK_LKOPTS=-Wl,'XPLINK'
+else
+XPLINK_CCOPTS=
+XPLINK_LKOPTS=
+endif
+CMP= -c -DOS390 ${CXXFLAGS} ${XPLINK_CCOPTS}
## OS390BATCH
ifeq (${OS390BATCH},1)
CC = _CXX_CXXSUFFIX="cpp" c++ -W0,"langlvl(extended)" -Wc,"TMPLPARSE(NO)"
-DOS390 -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -DOS390BATCH
else
CC = _CXX_CXXSUFFIX="cpp" c++ -W0,"langlvl(extended)" -Wc,"TMPLPARSE(NO)"
-DOS390 -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
endif
-LINK = ${CC} ${LDFLAGS}
+LINK = ${CC} ${LDFLAGS} ${XPLINK_LKOPTS}
PLATFORM_LIB_LINK_OPTIONS=
EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.dll
+ifeq (${OS390_XPLINK},1)
+OS390SIDEDECK=.xplink.x
+OS390BATCH_MAIN_DLL=IXM4C6XX
+else
OS390SIDEDECK=.x
+OS390BATCH_MAIN_DLL=IXM4C56X
+endif
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C55X)'"
+LIBRARY_NAMES="//'${LOADEXP}(${OS390BATCH_MAIN_DLL})'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
1.54 +21 -6 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.incl 20 Mar 2005 17:26:33 -0000 1.53
+++ Makefile.incl 18 May 2005 16:27:39 -0000 1.54
@@ -309,27 +309,42 @@
# export LOADMOD=USERID.LOAD #
# export LOADEXP=SYS1.SIXMEXP or &hlq.SIXMEXP #
# #
-# to specify your LOADMOD and the IXM4C55X definition sidedeck #
+# to specify your LOADMOD and the IXM4C56X definition sidedeck #
# dataset. #
###################################################################
ifeq (${PLATFORM}, OS390)
-CMP= -c -DOS390 ${CXXFLAGS}
+ifeq (${OS390_XPLINK},1)
+XPLINK_CCOPTS=-Wc,'XPLINK'
+XPLINK_LKOPTS=-Wl,'XPLINK'
+else
+XPLINK_CCOPTS=
+XPLINK_LKOPTS=
+endif
+CMP= -c -DOS390 ${CXXFLAGS} ${XPLINK_CCOPTS}
## OS390BATCH
ifeq (${OS390BATCH},1)
CC = _CXX_CXXSUFFIX="cpp" c++ -W0,"langlvl(extended)" -Wc,"TMPLPARSE(NO)"
-Wc,"float(IEEE)" -DOS390 -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -DOS390BATCH
else
CC = _CXX_CXXSUFFIX="cpp" c++ -W0,"langlvl(extended)" -Wc,"TMPLPARSE(NO)"
-Wc,"float(IEEE)" -DOS390 -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
endif
-LINK = ${CC} ${LDFLAGS}
+LINK = ${CC} ${LDFLAGS} ${XPLINK_LKOPTS}
PLATFORM_LIB_LINK_OPTIONS=
EXTRA_LINK_OPTIONS=
SHLIBSUFFIX=.dll
+ifeq (${OS390_XPLINK},1)
+OS390SIDEDECK=.xplink.x
+OS390BATCH_MAIN_DLL=IXM4C6XX
+OS390BATCH_DEPDOM_DLL=IXMDD6XX
+else
OS390SIDEDECK=.x
+OS390BATCH_MAIN_DLL=IXM4C56X
+OS390BATCH_DEPDOM_DLL=IXMDD56X
+endif
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C55X)'"
-LIBRARY_DEPDOM="//'${LOADEXP}(IXMDD55X)'"
+LIBRARY_NAMES="//'${LOADEXP}(${OS390BATCH_MAIN_DLL})'"
+LIBRARY_DEPDOM="//'${LOADEXP}(${OS390BATCH_DEPDOM_DLL})'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
LIBRARY_DEPDOM=${LIB_DIR}/lib${LIBDEPDOM}${VER}${OS390SIDEDECK}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
