xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src Makefile.in
Date Wed, 08 May 2002 15:40:38 GMT
dbertoni    02/05/08 08:40:38

  Modified:    c/src    Makefile.in
  Log:
  Added conditional processing for XalanTemplate.cpp to make sure NDEBUG is defined.  Removed
spurious 390 link option.
  
  Revision  Changes    Path
  1.93      +9 -2      xml-xalan/c/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Makefile.in	26 Apr 2002 07:03:28 -0000	1.92
  +++ Makefile.in	8 May 2002 15:40:38 -0000	1.93
  @@ -170,7 +170,6 @@
     ALLLIBS = ${LIBS}
     SHLIBSUFFIX=.sl
     CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
  -  CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
     CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
     MAKE_SHARED = $(CXX) -b +Z -Wl,+s
     LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
-Wl,+s
  @@ -248,7 +247,11 @@
   	PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
   	ALLLIBS = ${LIBS} -L/usr/lib 
   	CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
  +ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
  +	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG -I${STLPORTROOT}/stlport
  +else
   	CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -I${STLPORTROOT}/stlport
  +endif
       CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
   	MAKE_SHARED = makeC++SharedLib_r -p 5000 -brtl
   	LINK = $(CXX) -qnotempinc $(CXXFLAGS)  -brtl $(PLATFORM_COMPILE_OPTIONS)
  @@ -271,11 +274,15 @@
     OS390SIDEDECK=.x
   
     CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)  -I${STLPORTROOT}/stlport
  +ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
  +  CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) -DNDEBUG -I${STLPORTROOT}/stlport
  +else
     CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) -I${STLPORTROOT}/stlport
  +endif
     CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)  -I${STLPORTROOT}/stlport
     CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
     MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,compat=pm3 -D${PLATFORM} -Wl,dll
  -  LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm3 -Wl,dll
  +  LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm3
   
   endif
   
  
  
  

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


Mime
View raw message