dbertoni 01/01/27 10:04:10
Modified: c/src Makefile.in
Log:
Incorporated changes for Solaris with Sun Workshop 4.2.
Revision Changes Path
1.25 +101 -74 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 2001/01/25 19:06:14 1.24
+++ Makefile.in 2001/01/27 18:04:10 1.25
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.25 2001/01/27 18:04:10 dbertoni
+# Incorporated changes for Solaris with Sun Workshop 4.2.
+#
# Revision 1.24 2001/01/25 19:06:14 auriemma
# Removed spaces from include directive for solaris.
#
@@ -162,6 +165,69 @@
#
#
+###################################################################
+# IMPORTANT NOTE #
+###################################################################
+# Before you try to run the Makefile, make sure you have two #
+# environment variables set. #
+# #
+# export XALANCROOT=<the directory where you installed XALAN-C> #
+# export XERCESCROOT=<the directory where you installed XERCES-C> #
+# #
+###################################################################
+
+DEPFILE=depends
+
+#MACROS defining commands
+MKDIR=mkdir
+
+ifndef XALANCROOT
+noxalanroot:
+ @echo XALANCROOT must be defined
+endif
+
+ifndef XERCESCROOT
+noxercesroot:
+ @echo XERCESCROOT must be defined
+endif
+
+XALANDOM_DIR = XalanDOM
+DOMSUPPORT_DIR = DOMSupport
+INCLUDE_DIR = Include
+ICUBRIDGE_DIR = ICUBridge
+PLATFORMSUPPORT_DIR = PlatformSupport
+XALANSOURCETREE_DIR = XalanSourceTree
+TESTXPATH_DIR = TestXPath
+TESTXSLT_DIR = TestXSLT
+XMLSUPPORT_DIR = XMLSupport
+XPATH_DIR = XPath
+XSLT_DIR = XSLT
+XERCESINIT_DIR = XercesInit
+XERCESPARSERLIAISON_DIR = XercesParserLiaison
+ALL_OBJECTS_DIR = ${XALANCROOT}/obj
+LIB_DIR = ${XALANCROOT}/lib
+SAMPLES_DIR = ${XALANCROOT}/samples
+
+PROJECT_NAME = xalan-c
+LIBNAME = lib${PROJECT_NAME}
+THISLIB = ${LIB_DIR}/${LIBNAME}
+VER = 1_0
+
+PRODUCTNAME=xalan
+PRODUCTVERSION=${VER}
+BINTARGETDIR=${XALANCROOT}/bin
+
+ALL_VPATH_CPP = \
+$(XALANDOM_DIR):$(DOMSUPPORT_DIR):$(PLATFORMSUPPORT_DIR):$(XALANSOURCETREE_DIR):$(TESTXPATH_DIR):$(TESTXSLT_DIR):\
+$(XMLSUPPORT_DIR):$(XPATH_DIR):$(XSLT_DIR):$(XERCESINIT_DIR):\
+$(XERCESPARSERLIAISON_DIR)
+
+# Using ICUBridge
+ifdef XALAN_USE_ICU
+ALL_VPATH_CPP+=:$(ICUBRIDGE_DIR)
+endif
+
+
#all these setting come from the arguments passed in to runConfigure.
PLATFORM [EMAIL PROTECTED]@
CC = @cc@
@@ -211,21 +277,44 @@
ifeq ($(PLATFORM), SOLARIS)
SUPPORTED = TRUE
-PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM} -D_REENTRANT
-PLATFORM_COMPILE_OPTIONS += -DXALAN_CANNOT_MUTATE_ANONYMOUS_OBJECT
-ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
-SHLIBSUFFIX=.so
+
+ ifeq (${CXX}, g++)
+
+ PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM}
-D_REENTRANT
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
# We need the ICU library if we are using the ICUBridge
-ifdef XALAN_USE_ICU
-LD_RPATH_PRE= -Wl,-rpath,
-PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib
$(LD_RPATH_PRE)/usr/local/lib
-endif
+ ifdef XALAN_USE_ICU
+ LD_RPATH_PRE= -Wl,-rpath,
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib
$(LD_RPATH_PRE)/usr/local/lib
+ endif
+
+ EXTRA_LINK_OPTIONS=-lc
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
+ LINK = g++ -D${PLATFORM} -fPIC
+
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -lc
+
+ else
+
+ PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(ALL_OBJECTS_DIR)
-features=rtti -D${PLATFORM} -D_REENTRANT
+
+ CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
+ LINK = ${CXX} -D${PLATFORM} -ptr$(ALL_OBJECTS_DIR) ${LDFLAGS}
+
+ ifdef XALAN_USE_ICU
+ LD_RPATH_PRE= -Wl,-rpath,
+ PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)/usr/lib
$(LD_RPATH_PRE)/usr/local/lib
+ endif
+
+ ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
+ -lc -lgen
+ endif
-EXTRA_LINK_OPTIONS=-lc
-CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
-LINK = g++ -D${PLATFORM} -fPIC
+SHLIBSUFFIX=.so
endif
@@ -272,68 +361,6 @@
ifdef XALAN_USE_ICU
XSL_INCL += -I/usr/local/include/
XSL_BUILD_OPTIONS += -DXALAN_USE_ICU
-endif
-
-###################################################################
-# IMPORTANT NOTE #
-###################################################################
-# Before you try to run the Makefile, make sure you have two #
-# environment variables set. #
-# #
-# export XALANCROOT=<the directory where you installed XALAN-C> #
-# export XERCESCROOT=<the directory where you installed XERCES-C> #
-# #
-###################################################################
-
-DEPFILE=depends
-
-#MACROS defining commands
-MKDIR=mkdir
-
-ifndef XALANCROOT
-noxalanroot:
- @echo XALANCROOT must be defined
-endif
-
-ifndef XERCESCROOT
-noxercesroot:
- @echo XERCESCROOT must be defined
-endif
-
-XALANDOM_DIR = XalanDOM
-DOMSUPPORT_DIR = DOMSupport
-INCLUDE_DIR = Include
-ICUBRIDGE_DIR = ICUBridge
-PLATFORMSUPPORT_DIR = PlatformSupport
-XALANSOURCETREE_DIR = XalanSourceTree
-TESTXPATH_DIR = TestXPath
-TESTXSLT_DIR = TestXSLT
-XMLSUPPORT_DIR = XMLSupport
-XPATH_DIR = XPath
-XSLT_DIR = XSLT
-XERCESINIT_DIR = XercesInit
-XERCESPARSERLIAISON_DIR = XercesParserLiaison
-ALL_OBJECTS_DIR = ${XALANCROOT}/obj
-LIB_DIR = ${XALANCROOT}/lib
-SAMPLES_DIR = ${XALANCROOT}/samples
-
-PROJECT_NAME = xalan-c
-LIBNAME = lib${PROJECT_NAME}
-THISLIB = ${LIB_DIR}/${LIBNAME}
-VER = 1_0
-
-PRODUCTNAME=xalan
-PRODUCTVERSION=${VER}
-BINTARGETDIR=${XALANCROOT}/bin
-
-ALL_VPATH_CPP = \
-$(XALANDOM_DIR):$(DOMSUPPORT_DIR):$(PLATFORMSUPPORT_DIR):$(XALANSOURCETREE_DIR):$(TESTXPATH_DIR):$(TESTXSLT_DIR):\
-$(XMLSUPPORT_DIR):$(XPATH_DIR):$(XSLT_DIR):$(XERCESINIT_DIR):\
-$(XERCESPARSERLIAISON_DIR)
-
-# Using ICUBridge
-ifdef XALAN_USE_ICU
-ALL_VPATH_CPP+=:$(ICUBRIDGE_DIR)
endif
