dbertoni 02/04/08 21:18:02
Modified: c/src Tag: LotusXSL4C_1_3_0-390 Makefile.in
Log:
Branch for OS/390 reference release.
Revision Changes Path
No revision
No revision
1.80.2.1 +62 -22 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.80
retrieving revision 1.80.2.1
diff -u -r1.80 -r1.80.2.1
--- Makefile.in 14 Jan 2002 20:32:15 -0000 1.80
+++ Makefile.in 9 Apr 2002 04:18:02 -0000 1.80.2.1
@@ -62,7 +62,23 @@
# export XALANCROOT=<the directory where you installed XALAN-C> #
# export XERCESCROOT=<the directory where you installed XERCES-C> #
# #
+# If you are going to do the OS390BATCH build, make sure you have #
+# the OS390BATCH environment variable set. #
+# #
+# export OS390BATCH=1 #
+# #
+# Also, #
+# #
+# export LOADMOD=USERID.LOAD #
+# export LOADEXP=USERID.EXP #
+# #
+# to specify your LOADMOD and the definition sidedeck dataset. #
+# #
###################################################################
[EMAIL PROTECTED]
+#OS390BATCH=1
+#LOADMOD=SDULIN.V1R4.LOAD
+#LOADEXP=SDULIN.V1R4.EXP
DEPFILE=depends
@@ -88,6 +104,11 @@
endif
endif
+## OS390BATCH
+ifeq (${OS390BATCH},1)
+BATCH_TARGET = "//'${LOADMOD}(IXMLC13)'"
+endif
+
XALANDOM_DIR = XalanDOM
DOMSUPPORT_DIR = DOMSupport
INCLUDE_DIR = Include
@@ -267,6 +288,8 @@
SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
+ OS390NAME=$(LIB_DIR)/lib$(PROJECT_NAME)$(VER)$(OS390SIDEDECK)
+
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) -I${STLPORTROOT}/stlport
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
-I${STLPORTROOT}/stlport
@@ -313,7 +336,11 @@
# We need the Xerces library
ifeq ($(PLATFORM), OS390)
- ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_6_0.x
+ ## OS390BATCH
+ ifeq (${OS390BATCH},1)
+ ALLLIBSBATCH = "//'${LOADEXP}(IXM4C40X)'"
+ endif
+ ALLLIBS = $(XERCESCROOT)/lib/libxerces-c1_6_0.x
else
ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_6_0
endif
@@ -321,7 +348,10 @@
# We need the ICU library if we are using the ICUBridge
ifdef XALAN_USE_ICU
ifeq ($(PLATFORM), OS390)
- ALLLIBS += ${ICUROOT}/lib/libicuuc.x ${ICUROOT}/lib/libicui18n.x
+ ifeq (${OS390BATCH},1)
+ ALLLIBSBATCH += "//'${LOADEXP}(IXM20UCX)'" "//'${LOADEXP}(IXM2018X)'"
+ endif
+ ALLLIBS += ${ICUROOT}/lib/libicuuc.20.0.x
${ICUROOT}/lib/libicui18n.20.0.x
else
ALLLIBS += -L${ICUROOT}/lib -licuuc
ALLLIBS += -L${ICUI18NROOT}/lib -licui18n
@@ -407,7 +437,7 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $^ -o $@
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -423,7 +453,7 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $^ -o $@
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -439,7 +469,7 @@
ifeq ($(PLATFORM), OS390)
$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/TestXPath.o: $(TESTXPATH_DIR)/TestXPath.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o:
$(TESTXPATH_DIR)/NodeNameTreeWalker.cpp
@@ -463,7 +493,7 @@
${LIB_DIR}/mod_xslt$(SHLIBSUFFIX) : ${ALL_OBJECTS_DIR}/mod_xslt.o
ifeq ($(PLATFORM), OS390)
$(MAKE_SHARED) $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ApacheModuleXSLT/%.c
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I/usr/include/apache/
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
@@ -478,7 +508,7 @@
$(BINTARGETDIR)/CompileStylesheet: ${ALL_OBJECTS_DIR}/CompileStylesheet.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/CompileStylesheet/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -493,7 +523,7 @@
$(BINTARGETDIR)/DocumentBuilder: ${ALL_OBJECTS_DIR}/DocumentBuilder.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/DocumentBuilder/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -508,7 +538,7 @@
$(BINTARGETDIR)/ExternalFunction: ${ALL_OBJECTS_DIR}/ExternalFunction.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ExternalFunction/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -523,7 +553,7 @@
$(BINTARGETDIR)/SerializeNodeSet: ${ALL_OBJECTS_DIR}/SerializeNodeSet.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SerializeNodeSet/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -538,7 +568,7 @@
$(BINTARGETDIR)/SimpleTransform: ${ALL_OBJECTS_DIR}/SimpleTransform.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleTransform/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -553,7 +583,7 @@
$(BINTARGETDIR)/SimpleXPathAPI: ${ALL_OBJECTS_DIR}/SimpleXPathAPI.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathAPI/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -568,7 +598,7 @@
$(BINTARGETDIR)/SimpleXPathCAPI: ${ALL_OBJECTS_DIR}/SimpleXPathCAPI.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -583,7 +613,7 @@
$(BINTARGETDIR)/StreamTransform: ${ALL_OBJECTS_DIR}/StreamTransform.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -598,7 +628,7 @@
$(BINTARGETDIR)/TraceListen: ${ALL_OBJECTS_DIR}/TraceListen.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -613,7 +643,7 @@
$(BINTARGETDIR)/UseStylesheetParam: ${ALL_OBJECTS_DIR}/UseStylesheetParam.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/UseStylesheetParam/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -628,7 +658,7 @@
$(BINTARGETDIR)/XalanTransform: ${ALL_OBJECTS_DIR}/XalanTransform.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransform/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -643,7 +673,7 @@
$(BINTARGETDIR)/XalanTransformerCallback:
${ALL_OBJECTS_DIR}/XalanTransformerCallback.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XalanTransformerCallback/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -658,7 +688,7 @@
$(BINTARGETDIR)/XPathWrapper: ${ALL_OBJECTS_DIR}/XPathWrapper.o
${ALL_OBJECTS_DIR}/TestDriver.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/XPathWrapper/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -675,7 +705,7 @@
$(BINTARGETDIR)/ThreadTest: ${ALL_OBJECTS_DIR}/ThreadTest.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
else
@@ -711,7 +741,7 @@
$(BINTARGETDIR)/Conf: ${ALL_OBJECTS_DIR}/conf.o
${ALL_OBJECTS_DIR}/FileUtility.o ${ALL_OBJECTS_DIR}/XMLFileReporter.o
ifeq ($(PLATFORM), OS390)
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
+ ${EXTRA_LINK_OPTIONS} $(OS390NAME) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
else
@@ -721,7 +751,17 @@
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I$(TESTS_DIR)
$(EXTRA_COMPILE_OPTIONS) -o $@ $<
endif
-lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX)
+## Start OS390BATCH ##
+ifeq (${OS390BATCH},1)
+lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX) ${BATCH_TARGET}
+
+${BATCH_TARGET}: $(ALL_OBJECTS)
+ @echo Building ${BATCH_TARGET}
+ $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS)
$(ALLLIBSBATCH) $^ -o $@
+else
+lib: prepare compile $(THISLIB)$(VER)$(SHLIBSUFFIX)
+endif
+## End OS390BATCH ##
$(THISLIB)$(VER)$(SHLIBSUFFIX): $(ALL_OBJECTS)
$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
$^ -o $@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]