|
|
@@ -1,5 +1,5 @@
|
|
|
--- c/src/Makefile.in.dist Thu Dec 12 13:14:03 2002
|
|
|
-+++ c/src/Makefile.in Wed Dec 18 09:26:01 2002
|
|
|
++++ c/src/Makefile.in Tue Jan 7 14:17:08 2003
|
|
|
@@ -143,8 +143,9 @@
|
|
|
ifeq ($(PLATFORM), LINUX)
|
|
|
|
|
|
@@ -178,51 +178,61 @@
|
|
|
XalanExe: lib $(BINTARGETDIR)/Xalan
|
|
|
|
|
|
ifeq ($(PLATFORM), OS390)
|
|
|
- $(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
|
|
|
+-$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
|
|
|
++$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o lib
|
|
|
${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} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/XalanExe.o -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
|
|
|
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
else
|
|
|
- $(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
|
|
|
+-$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o
|
|
|
++$(BINTARGETDIR)/Xalan: ${ALL_OBJECTS_DIR}/XalanExe.o lib
|
|
|
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
|
|
|
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
|
|
|
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/XalanExe.o -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
${ALL_OBJECTS_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
|
|
|
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
endif
|
|
|
-@@ -451,13 +468,13 @@
|
|
|
+@@ -449,15 +466,15 @@
|
|
|
+ testXSLT: lib $(BINTARGETDIR)/testXSLT
|
|
|
+
|
|
|
ifeq ($(PLATFORM), OS390)
|
|
|
- $(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
|
|
|
+-$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
|
|
|
++$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o lib
|
|
|
${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} $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/process.o -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
|
|
|
$(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
else
|
|
|
- $(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
|
|
|
+-$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o
|
|
|
++$(BINTARGETDIR)/testXSLT: ${ALL_OBJECTS_DIR}/process.o lib
|
|
|
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
|
|
|
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $^ -o $@
|
|
|
-+ ${EXTRA_LINK_OPTIONS} $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} ${ALL_OBJECTS_DIR}/process.o -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
${ALL_OBJECTS_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
|
|
|
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
endif
|
|
|
-@@ -467,7 +484,7 @@
|
|
|
+@@ -465,44 +482,54 @@
|
|
|
+ testXPath: lib $(BINTARGETDIR)/testXPath
|
|
|
+
|
|
|
ifeq ($(PLATFORM), OS390)
|
|
|
- $(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
|
|
|
+-$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
|
|
|
++$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o lib
|
|
|
${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} $(CXXFLAGS) $^ -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@ $(LIB_DIR)/lib$(PROJECT_NAME)$(VER).x $(ALLLIBS)
|
|
|
${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
|
|
|
-@@ -475,34 +492,44 @@
|
|
|
+ $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
else
|
|
|
- $(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
|
|
|
+-$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o
|
|
|
++$(BINTARGETDIR)/testXPath: ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o lib
|
|
|
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
|
|
|
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS) $(CXXFLAGS) $^ -o $@
|
|
|
-+ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
++ ${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${ALL_OBJECTS_DIR}/TestXPath.o ${ALL_OBJECTS_DIR}/NodeNameTreeWalker.o -o $@ -L$(LIB_DIR) -l$(PROJECT_NAME) $(ALLLIBS)
|
|
|
${ALL_OBJECTS_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
|
|
|
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
|
|
|
endif
|
|
|
@@ -591,3 +601,12 @@
|
|
|
|
|
|
return OpCodeMapValueType(opPos + m_opMap[opPos + s_opCodeMapLengthIndex]);
|
|
|
}
|
|
|
+--- c/src/Include/GCCDefinitions.hpp.dist Tue Jan 7 11:59:57 2003
|
|
|
++++ c/src/Include/GCCDefinitions.hpp Tue Jan 7 12:00:16 2003
|
|
|
+@@ -89,4 +89,6 @@
|
|
|
+
|
|
|
+ #define XALAN_UNALIGNED
|
|
|
+
|
|
|
++#define XALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
|
|
|
++
|
|
|
+ #endif // GCCDEFINITIONS_HEADER_GUARD_1357924680
|