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

Diff for /pegasus/mak/config.mak between version 1.103 and 1.116

version 1.103, 2005/10/14 17:40:18 version 1.116, 2006/01/25 20:50:30
Line 86 
Line 86 
 endif endif
  
 ################################################################################ ################################################################################
   ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
       GCC_VERSION = $(shell g++ -dumpversion)
   else
       GCC_VERSION =
   endif
  
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
Line 161 
Line 166 
 # #
 # To use the PEGASUS_CIM_SCHEMA variable the Schema mof # To use the PEGASUS_CIM_SCHEMA variable the Schema mof
 # files must be placed in the directory # files must be placed in the directory
 # $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)  # $(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
 # #
 # The value of PEGASUS_CIM_SCHEMA must conform to the # The value of PEGASUS_CIM_SCHEMA must conform to the
 # following syntax: # following syntax:
Line 245 
Line 250 
  
 endef endef
  
   ifndef FORCE_NOCASE
   
 DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \ DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \
 $(SORT) $(2) > $(2).tmp $(NL) \ $(SORT) $(2) > $(2).tmp $(NL) \
 $(DIFF) $(1).tmp $(2).tmp $(NL) \ $(DIFF) $(1).tmp $(2).tmp $(NL) \
 $(RM) -f $(1).tmp $(NL) \ $(RM) -f $(1).tmp $(NL) \
 $(RM) -f $(2).tmp $(NL) $(RM) -f $(2).tmp $(NL)
  
   else
   
   DIFFSORT = $(SORT) -f $(1) > $(1).tmp $(NL) \
   $(SORT) -f $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   endif
   
   DIFFSORTNOCASE = $(SORT) $(1) > $(1).tmp $(NL) \
   $(SORT) $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   #
   # The following is used to define the usage message for MakeFile
   #
   # See the pegasus/Makfile for an exampleof its usage.
   #
   USAGE = @$(ECHO) " $(1)"
   
 ################################################################################ ################################################################################
 ## ##
 ## Attempt to include a platform configuration file: ## Attempt to include a platform configuration file:
Line 391 
Line 421 
 endif endif
  
 # #
   # PEP 72
   # Allow Out-of-Process Providers to be disabled by default
   #
   ifdef PEGASUS_DEFAULT_ENABLE_OOP
     ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
       DEFINES += -DPEGASUS_DEFAULT_ENABLE_OOP
     else
       ifneq ($(PEGASUS_DEFAULT_ENABLE_OOP),false)
         $(error PEGASUS_DEFAULT_ENABLE_OOP ($(PEGASUS_DEFAULT_ENABLE_OOP)) invalid, must be true or false)
       endif
     endif
   endif
   
   #
 # PEP 197 # PEP 197
 # Allow the Provider User Context feature to be disabled. # Allow the Provider User Context feature to be disabled.
 # #
Line 438 
Line 482 
   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
 endif endif
  
   # Allow qualifiers to be disabled for instance operations
   ifdef PEGASUS_DISABLE_INSTANCE_QUALIFIERS
     DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
   endif
   
   # Controls snmp indication handler to use NET-SNMP to deliver trap
   ifdef PEGASUS_USE_NET_SNMP
     DEFINES += -DPEGASUS_USE_NET_SNMP
   endif
   
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
 # Use PEGASUS_ENABLE_SLP to enable SLP functions in the Pegasus standard  # PEGASUS_DISABLE_SLP has been depracated. New use model is:
 # compile on those platforms that do not enable it by default.  #
   # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions.
 # #
 # Use PEGASUS_DISABLE_SLP to disable SLP on those platforms that enable  # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.
 # it by default.  
 # #
 # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP
 # by default. # by default.
Line 455 
Line 509 
 # the variable PEGASUS_ENABLE_SLP. # the variable PEGASUS_ENABLE_SLP.
 # #
 # #
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
   ifdef PEGASUS_DISABLE_SLP   ifdef PEGASUS_DISABLE_SLP
     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
   endif   endif
   endif
   
   ifdef PEGASUS_DISABLE_SLP
       $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
   
   PEGASUS_ENABLE_SLP=false
   
   endif
   
   ifdef PEGASUS_ENABLE_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
     else
       ifneq ($(PEGASUS_ENABLE_SLP),false)
         $(error PEGASUS_ENABLE_SLP ($(PEGASUS_ENABLE_SLP)) invalid, must be true or false)
       endif
     endif
   endif
   
   #
   # Enable this flag to allow the handshake to continue regardless of verification result
   #
   ifdef PEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
     DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
Line 538 
Line 616 
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
   ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
       FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
   endif
   
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
 ifndef PEGASUS_DEST_LIB_DIR ifndef PEGASUS_DEST_LIB_DIR
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib
Line 551 
Line 633 
  
 ################################################################################ ################################################################################
 ## ##
   ## PEGASUS_CLASS_CACHE_SIZE
   ##
   ##     This environment variable gives the size of the class cache used by
   ##     the CIM repository. When it is undefined, the size defaults to something
   ##     relatively small (see src/Pegasus/Repository/CIMRepository.cpp). If
   ##     defined, it gives the size of the class cache. If it is 0 , the class
   ##     cache is not defined compiled in at all.
   ##
   ################################################################################
   
   ifdef PEGASUS_CLASS_CACHE_SIZE
   DEFINES += -DPEGASUS_CLASS_CACHE_SIZE=$(PEGASUS_CLASS_CACHE_SIZE)
   endif
   
   ################################################################################
   ##
 ## Additional build flags passed in through environment variables. ## Additional build flags passed in through environment variables.
 ## These flags are added to the compile/link commands. ## These flags are added to the compile/link commands.
 ## ##

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