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 2005/05/05 18:52:38 UTC

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

dbertoni    2005/05/05 09:52:37

  Modified:    c        Makefile.incl.in
  Log:
  Fix for Jira issue XALANC-506.
  
  Revision  Changes    Path
  1.33      +4 -4      xml-xalan/c/Makefile.incl.in
  
  Index: Makefile.incl.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Makefile.incl.in	18 Apr 2005 16:59:07 -0000	1.32
  +++ Makefile.incl.in	5 May 2005 16:52:37 -0000	1.33
  @@ -344,7 +344,7 @@
   
   	PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XSL_OBJ_DIR) -features=rtti -D${PLATFORM} -D_REENTRANT
   
  -	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
  +	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
       CC4 = $(CC) $(CXXFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
       MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XSL_OBJ_DIR) ${LDFLAGS} 
       LINK_SONAME = -h ${SO_NAME} 
  @@ -392,11 +392,11 @@
   
   	PLATFORM_COMPILE_OPTIONS = -qthreaded -D${PLATFORM} -D_THREAD_SAFE
   	ALLLIBS = ${LIBS} -L/usr/lib 
  -	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
  +	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
   ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
  -	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG -I${STLPORTROOT}/stlport
  +	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG
   else
  -	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
  +	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
   endif
       CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
   
  
  
  

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