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

Diff for /pegasus/mak/config.mak between version 1.183.2.3 and 1.184

version 1.183.2.3, 2010/08/11 11:20:29 version 1.184, 2009/02/25 06:15:06
Line 223 
Line 223 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM222      PEGASUS_CIM_SCHEMA=CIM217
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 1221 
Line 1221 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifndef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
    PEGASUS_USE_RELEASE_CONFIG_OPTIONS=false  
 endif  
   
 ifeq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),true)  
    DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS    DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
 else  
    ifneq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),false)  
       $(error PEGASUS_USE_RELEASE_CONFIG_OPTIONS \  
           ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)) invalid, must be true or false)  
    endif  
 endif endif
  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
Line 1297 
Line 1288 
 ##============================================================================== ##==============================================================================
  
 ifdef PEGASUS_USE_STATIC_LIBRARIES ifdef PEGASUS_USE_STATIC_LIBRARIES
   ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)    ifeq ($(OS_TYPE),windows)
       $(error PEGASUS_USE_STATIC_LIBRARIES is not support on windows.)
   else   else
     ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)        ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
       $(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)          $(error PEGASUS_USE_STATIC_LIBRARIES \
             ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true.)
         endif
     endif     endif
   endif   endif
 endif endif
Line 1484 
Line 1478 
 ifndef PLATFORM_CORE_PATTERN ifndef PLATFORM_CORE_PATTERN
     PLATFORM_CORE_PATTERN = core*     PLATFORM_CORE_PATTERN = core*
 endif endif
   
 ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR  
    ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS  
       $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")  
    endif  
    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"$(PEGASUS_EXTRA_PROVIDER_LIB_DIR):\"  
 else  
    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"  
 endif  
   


Legend:
Removed from v.1.183.2.3  
changed lines
  Added in v.1.184

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2