(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.35.2.2 and 1.60

version 1.35.2.2, 2005/09/30 16:28:12 version 1.60, 2008/12/02 09:00:01
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// 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  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "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.  
 #// #//
 #//==============================================================================  #// 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 34 
Line 34 
 DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU DEFINES += -DPEGASUS_PLATFORM_LINUX_GENERIC_GNU
 DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) DEFINES += -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM)
  
   #########################################################################
   ##
   ## Platform specific compile options controlled by environment variables
   ## are set here.
   ##
   #########################################################################
   
   
   # Enable OOP by default if preference not already set in the environment
   #
   ifndef PEGASUS_DEFAULT_ENABLE_OOP
   PEGASUS_DEFAULT_ENABLE_OOP = true
   endif
   
   
 # Enable CMPI by default. # Enable CMPI by default.
 # #
 #PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=yes  ifndef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
   PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
   endif
   
   #########################################################################
  
 OS = linux OS = linux
  
Line 72 
Line 91 
  
 DEFINES += -DPEGASUS_USE_SYSLOGS DEFINES += -DPEGASUS_USE_SYSLOGS
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  SYS_LIBS = -ldl -lpthread -lcrypt
  
 SYS_LIBS = -ldl -lpthread  FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
  
 # Build using fixed release settings  ##==============================================================================
 #  ##
 ifdef PEGASUS_USE_RELEASE_DIRS  ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared
   PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib  ## libraries.
 endif  ##
   ##==============================================================================
   DYNAMIC_FLAGS += -fPIC
  
 # PAM support  ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
 ifdef PEGASUS_PAM_AUTHENTICATION    FLAGS += -g
    ifeq ($(HPUX_IA64_VERSION), yes)  
       SYS_LIBS += -L$(PAMLIB_HOME) -lpam  
    else    else
       SYS_LIBS += -lpam    FLAGS += -s
    endif    #
     # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
 ## The following flags need to be set or unset    # appeared in the 3.0 series of compilers.
 ## to compile-in the code required for PAM authentication    #
 ## and compile-out the code that uses the password file.    ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
       EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  
   
 endif endif
   
   
 ifdef PEGASUS_DEBUG  
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  
 else  
 FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs  
   ifdef PEGASUS_OPTIMIZE_FOR_SIZE   ifdef PEGASUS_OPTIMIZE_FOR_SIZE
     FLAGS += -Os     FLAGS += -Os
   else   else
Line 110 
Line 121 
   endif   endif
 endif endif
  
 ifndef PEGASUS_USE_MU_DEPEND  FLAGS += $(CXX_MACHINE_OPTIONS)
 PEGASUS_HAS_MAKEDEPEND = yes  
 endif  
  
 # l10n  ifdef PEGASUS_ENABLE_GCOV
 ifdef PEGASUS_HAS_MESSAGES    FLAGS += -ftest-coverage -fprofile-arcs
   DEFINES += -DPEGASUS_HAS_MESSAGES    SYS_LIBS += -lgcc -lgcov
   ifdef ICU_ROOT    EXTRA_LIBRARIES += -lgcc -lgcov
         MSG_COMPILE = 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  ifndef PEGASUS_USE_MU_DEPEND
   CNV_ROOT_FLAGS =  PEGASUS_HAS_MAKEDEPEND = yes
 else  
   CNV_ROOT_FLAGS = -u  
 endif endif
  
 ####################################  ##==============================================================================
 ## ##
 ##   ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from  ## Set the default visibility symbol to hidden for shared libraries. This
 ##   defaults to _en if not set.  if set, for any directory containing resource bundles,  ## feature is only available in GCC 4.0 and later.
 ##   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  ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
   MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)      FLAGS += -fvisibility=hidden
 else  
   MSG_ROOT_SOURCE = _en  
 endif endif
  
     SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n  ifndef PEGASUS_ARCH_LIB
     DEFINES += -DPEGASUS_HAS_ICU      ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
     EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata          PEGASUS_ARCH_LIB = lib64
       else
           PEGASUS_ARCH_LIB = lib
   endif   endif
 endif endif
   DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"
 ####################################  
 ##  
 ##   If PEGASUS_LSB is set, set the rest of the variables.  
 ##  
 ####################################  
   
 ifdef PEGASUS_LSB  
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/  
     FLAGS += -DPEGASUS_OS_LSB  
 endif  
   
 #DEFINES += -DPEGASUS_USE_INTERNAL_INLINES  

Legend:
Removed from v.1.35.2.2  
changed lines
  Added in v.1.60
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2