dbertoni 01/08/08 10:14:28
Modified: c/src Makefile.in
Log:
Removed ThreadSafe from samples.
Revision Changes Path
1.49 +21 -38 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.in 2001/08/08 15:46:33 1.48
+++ Makefile.in 2001/08/08 17:14:28 1.49
@@ -224,33 +224,31 @@
MAKE_SHARED = makeC++SharedLib_r -p 5000
LINK = $(CXX) -qnotempinc $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+endif
+
+#=============== OS390 SPECIFIC OPTIONS =========================
+ifeq ($(PLATFORM), OS390)
+
+ifndef STLPORTROOT
+nostlportroot:
+ @echo STLPORTROOT must be defined
endif
-#=============== OS390 SPECIFIC OPTIONS =========================
-
-ifeq ($(PLATFORM), OS390)
-
-
-ifndef STLPORTROOT
-nostlportroot:
- @echo STLPORTROOT must be defined
-endif
-
-SUPPORTED = TRUE
+SUPPORTED = TRUE
PLATFORM_COMPILE_OPTIONS =-Wc,dll -W0,"langlvl(extended),float(ieee)"
-D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
PLATFORM_COMPILE_OPTIONS2 =-Wc,dll
-W0,"langlvl(extended),notempinc,float(ieee)" -D${PLATFORM} -D_OPEN_THREADS
-D_XOPEN_SOURCE_EXTENDED -I ${STLPORTROOT}/stlport
-ALLLIBS =
-SHLIBSUFFIX=.dll
-OS390SIDEDECK=.x
-
-CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
-CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
-MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
-LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-
-endif
+ALLLIBS =
+SHLIBSUFFIX=.dll
+OS390SIDEDECK=.x
+
+CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
+CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
+MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll
+LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+
+endif
#============ TRU64 SPECIFIC OPTIONS ============================
ifeq ($(PLATFORM), TRU64)
@@ -402,7 +400,7 @@
tests : ThreadTest
-Samples: lib CompileStylesheet DocumentBuilder ExternalFunction
SimpleTransform SimpleXPathAPI StreamTransform ThreadSafe TraceListen
UseStylesheetParam XalanTransform XalanTransformerCallback XPathWrapper
+Samples: lib CompileStylesheet DocumentBuilder ExternalFunction
SimpleTransform SimpleXPathAPI StreamTransform TraceListen UseStylesheetParam
XalanTransform XalanTransformerCallback XPathWrapper
ApacheModuleXSLT: lib ${LIB_DIR}/mod_xslt$(SHLIBSUFFIX)
@@ -506,21 +504,6 @@
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
- $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
-endif
-
-ThreadSafe: lib $(BINTARGETDIR)/ThreadSafe
-
-$(BINTARGETDIR)/ThreadSafe: ${ALL_OBJECTS_DIR}/ThreadSafe.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 $@
-${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ThreadSafe/%.cpp
- $(CC3) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
-else
- ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}
${LIBRARY_SEARCH_PATHS} \
- ${EXTRA_LINK_OPTIONS} -L$(LIB_DIR) -l$(PROJECT_NAME)$(VER) $(ALLLIBS)
$(CXXFLAGS) $^ -o $@
-${ALL_OBJECTS_DIR}/%.o:$(SAMPLES_DIR)/ThreadSafe/%.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o
$@ $<
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
