dmitryh 2004/05/28 11:19:37
Modified: c Makefile.incl.in
c/src/xalanc Makefile.in
Log:
Fixes for zOS port
Revision Changes Path
1.19 +17 -7 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.incl.in 7 Apr 2004 21:48:36 -0000 1.18
+++ Makefile.incl.in 28 May 2004 18:19:37 -0000 1.19
@@ -384,6 +384,10 @@
SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
+ CPPMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)'
-DXALAN_XALANMSGLIB_BUILD_DLL
+ CMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)' -DXALAN_XALANMSGLIB_BUILD_DLL
+ CXXMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)'
-DXALAN_XALANMSGLIB_BUILD_DLL
+
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG
@@ -392,28 +396,34 @@
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,compat=pm3 -D${PLATFORM} -Wl,dll
- LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm3
+ CC5 = $(CXX) $(CXXMSGFLAGS) -Wl,compt=pm4 $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,compat=pm4 -D${PLATFORM} -Wl,dll
+ MAKE_SHARED_MSG = ${CXX} $(CXXMSGFLAGS) -Wl,compat=pm4 -D${PLATFORM}
-Wl,dll
+ LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm4
XERCES_LIB=$(XERCESCROOT)/lib/libxerces-c2_5_0.x
ICU_LIB=$(XERCESCROOT)/lib/libicuuc26.1.x
$(XERCESCROOT)/lib/libicui18n26.1.x
- LIB=$(LIB_NAME).$(VER)$(OS390SIDEDECK)
+ LIB=$(LIB_NAME).$(VER)$(SHLIBSUFFIX)
LIBRARY_SEARCH_PATH=
- LIBRARY_LINK_NAME=$(XSL_LIB_DIR)/$(LIB_NAME)$(OS390SIDEDECK)
+ LIBRARY_LINK_NAME=$(XSL_LIB_DIR)/$(LIB_NAME).$(VER)$(OS390SIDEDECK)
+ LOC_LIB=${LOC_LIBNAME}.${VER}$(SHLIBSUFFIX)
+ MESSAGELIB=${XSL_LIB_DIR}/${LOC_LIB}
## OS390BATCH
ifeq (${OS390BATCH},1)
- BATCH_PROJECT_NAME = IXMLC15
- BATCH_TARGET = "//'${LOADMOD}($/{BATCH_PROJECT_NAME})'"
+ BATCH_PROJECT_NAME = IXMLC18
+ BATCH_MESSAGE_NAME = IXMMSG18
+ BATCH_TARGET = "//'${LOADMOD}(${BATCH_PROJECT_NAME})'"
ALLLIBS = "//'${LOADEXP}(IXM4C54X)'" "//'${LOADEXP}(IXM26UCX)'"
"//'${LOADEXP}(IXMI26IN)'"
LIBRARY_LINK_NAME= "//'${LOADEXP}(${BATCH_PROJECT_NAME})'"
+ MESSAGELIB="//'${LOADMOD}(${BATCH_MESSAGE_NAME})'"
endif ## OS390BATCH
MAKE_SHARED_LOC=$(MAKE_SHARED)
- LOC_LIB = ${LOC_LIBNAME}.${VER}$(OS390SIDEDECK)
+
endif
1.33 +4 -4 xml-xalan/c/src/xalanc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.in 7 Apr 2004 21:48:36 -0000 1.32
+++ Makefile.in 28 May 2004 18:19:37 -0000 1.33
@@ -165,17 +165,17 @@
compile: $(ALL_OBJECTS)
ifeq (${OS390BATCH},1)
-XalanExe: lib "//'$(LOADSAMP)(XALAN)'"
+XalanExe: lib "//'$(LOADSAMP)(IXMXAL17)'"
-"//'$(LOADSAMP)(XALAN)'": ${XSL_OBJ_DIR}/XalanExe.o
+"//'$(LOADSAMP)(IXMXAL17)'": ${XSL_OBJ_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
-testXSLT: lib "//'$(LOADSAMP)(TESTXSLT)'"
+testXSLT: lib "//'$(LOADSAMP)(IXMTST17)'"
-"//'$(LOADSAMP)(TESTXSLT)'": ${XSL_OBJ_DIR}/process.o
+"//'$(LOADSAMP)(IXMTST17)'": ${XSL_OBJ_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
