(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.29 and 1.49

version 1.29, 2005/02/11 23:52:59 version 1.49, 2006/06/19 20:47:30
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// 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.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec 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 36 
 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 22 
Line 71 
  
 SH = sh SH = sh
  
 YACC = yacc  YACC = bison
   
   RM = rm -f
   
   DIFF = diff
   
   SORT = sort
  
 COPY = cp COPY = cp
  
Line 40 
Line 95 
  
 DEFINES += -DPEGASUS_HAS_SIGNALS DEFINES += -DPEGASUS_HAS_SIGNALS
  
 SYS_LIBS = -ldl -lpthread  SYS_LIBS = -ldl -lpthread -lcrypt
   
 # Build using fixed release settings  
 #  
 ifdef PEGASUS_USE_RELEASE_DIRS  
   PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib  
 endif  
  
 # PAM support # PAM support
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
Line 64 
Line 113 
  
 endif endif
  
   FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
  
 ifdef PEGASUS_DEBUG  ##==============================================================================
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  ##
   ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared
   ## libraries.
   ##
   ##==============================================================================
   DYNAMIC_FLAGS += -fPIC
   
   ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
     FLAGS += -g
 else else
 FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs    FLAGS += -s
     #
     # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
     # appeared in the 3.0 series of compilers.
     #
     ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
       EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
     endif
   ifdef PEGASUS_OPTIMIZE_FOR_SIZE   ifdef PEGASUS_OPTIMIZE_FOR_SIZE
     FLAGS += -Os     FLAGS += -Os
   else   else
Line 76 
Line 141 
   endif   endif
 endif endif
  
 ifndef PEGASUS_USE_MU_DEPEND  FLAGS += $(CXX_MACHINE_OPTIONS)
 PEGASUS_HAS_MAKEDEPEND = yes  
 endif  
  
 ifdef PEGASUS_LOCAL_DOMAIN_SOCKET  ifdef PEGASUS_ENABLE_GCOV
  FLAGS += -DPEGASUS_LOCAL_DOMAIN_SOCKET    FLAGS += -ftest-coverage -fprofile-arcs
     SYS_LIBS += -lgcc -lgcov
     EXTRA_LIBRARIES += -lgcc -lgcov
 endif endif
  
 ifdef USE_CONNECTLOCAL  ifndef PEGASUS_USE_MU_DEPEND
  FLAGS += -DUSE_CONNECTLOCAL  PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
  
 # l10n # l10n
Line 126 
Line 191 
  
     SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n     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 142 
Line 206 
     FLAGS += -DPEGASUS_OS_LSB     FLAGS += -DPEGASUS_OS_LSB
 endif endif
  
   ##==============================================================================
   ##
   ## Set the default visibility symbol to hidden for shared libraries. This
   ## feature is only available in GCC 4.0 and later.
   ##
   ##==============================================================================
   
   ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
       FLAGS += -fvisibility=hidden
   endif
   
   ifndef PEGASUS_ARCH_LIB
       ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
           PEGASUS_ARCH_LIB = lib64
       else
           PEGASUS_ARCH_LIB = lib
       endif
   endif
   DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"

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