(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.36 and 1.52

version 1.36, 2005/10/11 11:51:44 version 1.52, 2007/04/11 20:41:42
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// 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 #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 34 
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 74 
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 98 
Line 113 
  
 endif endif
  
   FLAGS += -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 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT    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 110 
Line 141 
   endif   endif
 endif endif
  
   FLAGS += $(CXX_MACHINE_OPTIONS)
   
   ifdef PEGASUS_ENABLE_GCOV
     FLAGS += -ftest-coverage -fprofile-arcs
     SYS_LIBS += -lgcc -lgcov
     EXTRA_LIBRARIES += -lgcc -lgcov
   endif
   
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
Line 156 
Line 195 
   endif   endif
 endif endif
  
 ####################################  ##==============================================================================
 ## ##
 ##   If PEGASUS_LSB is set, set the rest of the variables.  ## Set the default visibility symbol to hidden for shared libraries. This
   ## feature is only available in GCC 4.0 and later.
 ## ##
 ####################################  ##==============================================================================
  
 ifdef PEGASUS_LSB  ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/      FLAGS += -fvisibility=hidden
     FLAGS += -DPEGASUS_OS_LSB  
 endif 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.36  
changed lines
  Added in v.1.52
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2