(file) Return to platform_ZOS_ZSERIES_IBM.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_ZOS_ZSERIES_IBM.mak between version 1.10.2.2 and 1.17

version 1.10.2.2, 2004/03/30 15:08:46 version 1.17, 2005/05/12 08:52:50
Line 18 
Line 18 
 DEPEND_DEFINES = -D__IBMCPP__=400 DEPEND_DEFINES = -D__IBMCPP__=400
  
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
 FLAGS = -+ -g -W "c,ASCII,XPLINK,dll,expo,rtti(dynamiccast),langlvl(extended),float(ieee)"  FLAGS = -g -W "c,ASCII,XPLINK,dll,expo,rtti(dynamiccast),langlvl(extended),float(ieee)"
 PR_FLAGS = -+ -g -W "c,ASCII,XPLINK,dll,expo,langlvl(extended),FLOAT(IEEE)" -W "l,XPLINK,dll"  PR_FLAGS = -g -W "c,ASCII,XPLINK,dll,expo,langlvl(extended),FLOAT(IEEE)" -W "l,XPLINK,dll"
 else else
 FLAGS = -+ -O2 -W "c,ASCII,XPLINK,dll,expo,rtti(dynamiccast),langlvl(extended),float(ieee)"  FLAGS = -O2 -W "c,ASCII,XPLINK,dll,expo,rtti(dynamiccast),langlvl(extended),float(ieee)"
 PR_FLAGS = -+ -O2 -W "c,ASCII,XPLINK,dll,expo,langlvl(extended),FLOAT(IEEE)" -W "l,XPLINK,dll"  PR_FLAGS = -O2 -W "c,ASCII,XPLINK,dll,expo,langlvl(extended),FLOAT(IEEE)" -W "l,XPLINK,dll"
 endif  
   
 ifdef PEGASUS_HAS_SSL  
   FLAGS += -L$(OPENSSL_HOME)/lib  
   PR_FLAGS += -L$(OPENSSL_HOME)/lib  
 endif endif
  
 ifdef PEGASUS_ZOS_SECURITY ifdef PEGASUS_ZOS_SECURITY
Line 43 
Line 38 
   DEFINES += -DPEGASUS_ZOS_THREADLEVEL_SECURITY   DEFINES += -DPEGASUS_ZOS_THREADLEVEL_SECURITY
 endif endif
  
   # Local domain sockets, or an equivalent, is not currently supported on z/OS. Bug 2147
   PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
   
 SYS_LIBS = SYS_LIBS =
  
 CXX = c++  CXX = c++ -+
   
   CC = cc
  
 SH = sh SH = sh
  
 YACC = bison YACC = bison
  
   RM = rm -f
   
   DIFF = diff
   
   SORT = sort
   
 COPY = cp COPY = cp
  
 MOVE = mv MOVE = mv
Line 59 
Line 65 
  
 PEGASUS_SUPPORTS_DYNLIB = yes PEGASUS_SUPPORTS_DYNLIB = yes
  
 ifdef PEGASUS_USE_RELEASE_DIRS  
  DEFINES += -DPEGASUS_USE_RELEASE_DIRS  
 endif  
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
   # l10n
   ifdef PEGASUS_HAS_MESSAGES
     DEFINES += -DPEGASUS_HAS_MESSAGES
     ifdef ICU_ROOT
           ifdef ICU_INSTALL
             MSG_COMPILE = ${ICU_INSTALL}/bin/genrb
           else
             MSG_COMPILE = ${ICU_ROOT}/bin/genrb
           endif
           MSG_FLAGS =
           MSG_SOURCE_EXT = .txt
           MSG_COMPILE_EXT = .res
           CNV_ROOT_CMD = cnv2rootbundle
   
   ##################################
   ##
   ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root
   ## resource bundle, default is to uppercase the root resource bundle
   ##
   ##################################
   
           ifdef ICU_NO_UPPERCASE_ROOT
             CNV_ROOT_FLAGS =
           else
             CNV_ROOT_FLAGS = -u
           endif
   
   ####################################
   ##
   ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource
   ## bundle will be generated from defaults to _en if not set.  if set, for
   ## any directory containing resource bundles, there must exist a file name:
   ## package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages
   ## target will fail
   ##
   ####################################
   
           ifdef ICU_ROOT_BUNDLE_LANG
             MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)
           else
             MSG_ROOT_SOURCE = _en
           endif
           SYS_INCLUDES += -I${ICU_INSTALL}/include
           DEFINES += -DPEGASUS_HAS_ICU
           ifdef ICU_INSTALL
             FLAGS+ = -L${ICU_INSTALL}/lib
             PR_FLAGS += -L${ICU_INSTALL}/lib
             EXTRA_LIBRARIES += ${ICU_INSTALL}/lib/libicui18n.x ${ICU_INSTALL}/lib/libicuuc.x
           endif
     endif
   endif


Legend:
Removed from v.1.10.2.2  
changed lines
  Added in v.1.17

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2