You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/08/01 20:44:30 UTC

cvs commit: xml-xalan/c/src Makefile.in

dbertoni    2002/08/01 11:44:30

  Modified:    c/src    Tag: LotusXSL4C_1_3_1 Makefile.in
  Log:
  Added support for Intel compiler.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.99.4.1  +18 -9     xml-xalan/c/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
  retrieving revision 1.99
  retrieving revision 1.99.4.1
  diff -u -r1.99 -r1.99.4.1
  --- Makefile.in	23 May 2002 00:13:24 -0000	1.99
  +++ Makefile.in	1 Aug 2002 18:44:30 -0000	1.99.4.1
  @@ -114,7 +114,7 @@
   PROJECT_NAME = xalan-c
   LIBNAME = lib${PROJECT_NAME}
   THISLIB = ${LIB_DIR}/${LIBNAME}
  -VER = 1_4_0
  +VER = 1_3_1
   
   PRODUCTNAME = xalan
   PRODUCTVERSION = ${VER}
  @@ -142,21 +142,30 @@
   ifeq ($(PLATFORM), LINUX)
   
     SUPPORTED = TRUE
  -  PLATFORM_COMPILE_OPTIONS = -fpic -Wall -D${PLATFORM} -D_REENTRANT
     ALLLIBS = ${LIBS} -L/usr/lib
     SHLIBSUFFIX=.so
   
  +  ifeq (${CXX}, icpc)
  +
  +    PLATFORM_COMPILE_OPTIONS = -w1 -Xa -mp -prec_div -KPIC -D${PLATFORM} -D_REENTRANT
  +
  +  else
  +
  +    PLATFORM_COMPILE_OPTIONS = -fPIC -Wall -D${PLATFORM} -D_REENTRANT
  +
  +  endif
  +
     # 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)${ICUROOT}/lib 
  +    LD_RPATH_PRE= -Wl,-rpath,
  +    PLATFORM_LIB_LINK_OPTIONS=$(LD_RPATH_PRE)${ICUROOT}/lib 
     endif
   
  -  EXTRA_LINK_OPTIONS=-lc
  +  EXTRA_LINK_OPTIONS=
     CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
     CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
  -  MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fpic
  -  LINK =  g++ -D${PLATFORM} -fpic
  +  MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC
  +  LINK = $(CXX) -D${PLATFORM} -fpic
   
   endif
   
  @@ -323,9 +332,9 @@
   
   # We need the Xerces library
   ifeq ($(PLATFORM), OS390)
  -  ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_7_0.x
  +  ALLLIBS += $(XERCESCROOT)/lib/libxerces-c1_6_0.x
   else
  -  ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_7_0
  +  ALLLIBS += -L$(XERCESCROOT)/lib -lxerces-c1_6_0
   endif
   
   # We need the ICU library if we are using the ICUBridge
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org