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

Diff for /pegasus/mak/config-linux.mak between version 1.21 and 1.35.2.2

version 1.21, 2004/08/12 12:41:10 version 1.35.2.2, 2005/09/30 16:28:12
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 # Configuration options for Pegasus on all architectures running Linux # Configuration options for Pegasus on all architectures running Linux
  
 include $(ROOT)/mak/config-unix.mak include $(ROOT)/mak/config-unix.mak
Line 6 
Line 34 
 DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU
 DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM)
  
   # Enable CMPI by default.
   #
   #PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=yes
   
 OS = linux OS = linux
  
 COMPILER = gnu COMPILER = gnu
Line 18 
Line 50 
  
 SH = sh SH = sh
  
 YACC = yacc  YACC = bison
   
   RM = rm -f
   
   DIFF = diff
   
   SORT = sort
  
 COPY = cp COPY = cp
  
Line 36 
Line 74 
  
 DEFINES += -DPEGASUS_HAS_SIGNALS DEFINES += -DPEGASUS_HAS_SIGNALS
  
 SYS_LIBS = -ldl -lpthread -lcrypt  SYS_LIBS = -ldl -lpthread
   
 ifdef PEGASUS_HAS_SSL  
   SYS_LIBS += -lssl  
 endif  
  
 # Build using fixed release settings # Build using fixed release settings
 # #
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 endif  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
 FLAGS += -DPEGASUS_USE_RELEASE_DIRS    PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib
 endif endif
  
 # PAM support # PAM support
Line 71 
Line 102 
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 else else
 FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs
     ifdef PEGASUS_OPTIMIZE_FOR_SIZE
       FLAGS += -Os
     else
       FLAGS += -O2
     endif
 endif endif
  
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
  
 ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  
  FLAGS += -DPEGASUS_LOCAL_DOMAIN_SOCKET  
 endif  
   
 ifdef USE_CONNECTLOCAL  
  FLAGS += -DUSE_CONNECTLOCAL  
 endif  
   
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
   DEFINES += -DPEGASUS_HAS_MESSAGES   DEFINES += -DPEGASUS_HAS_MESSAGES
Line 122 
Line 150 
   MSG_ROOT_SOURCE = _en   MSG_ROOT_SOURCE = _en
 endif endif
  
     EXTRA_INCLUDES += -I${ICUROOT}/source/common      SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
     SYS_LIBS += -licuuc      EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata
     SYS_LIBS += -licui18n  
   endif   endif
 endif endif
  
Line 140 
Line 167 
     FLAGS += -DPEGASUS_OS_LSB     FLAGS += -DPEGASUS_OS_LSB
 endif endif
  
   #DEFINES += -DPEGASUS_USE_INTERNAL_INLINES


Legend:
Removed from v.1.21  
changed lines
  Added in v.1.35.2.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2