dbertoni 02/05/08 08:47:52
Modified: c/src Tag: LotusXSL4C_1_3_0-390 Makefile.in
Log:
Added conditional processing for XalanTemplate.cpp to make sure NDEBUG is
defined. Removed spurious 390 link option.
Revision Changes Path
No revision
No revision
1.80.2.2 +11 -3 xml-xalan/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.80.2.1
retrieving revision 1.80.2.2
diff -u -r1.80.2.1 -r1.80.2.2
--- Makefile.in 9 Apr 2002 04:18:02 -0000 1.80.2.1
+++ Makefile.in 8 May 2002 15:47:52 -0000 1.80.2.2
@@ -266,7 +266,11 @@
PLATFORM_COMPILE_OPTIONS = -D${PLATFORM} -D_THREAD_SAFE
ALLLIBS = ${LIBS} -L/usr/lib
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
- CC2 = $(CXX) $(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)
@@ -291,11 +295,15 @@
OS390NAME=$(LIB_DIR)/lib$(PROJECT_NAME)$(VER)$(OS390SIDEDECK)
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
-I${STLPORTROOT}/stlport
- CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) -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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
