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

Diff for /pegasus/mak/config.mak between version 1.188 and 1.193

version 1.188, 2009/12/15 10:52:31 version 1.193, 2010/10/29 05:29:47
Line 105 
Line 105 
 ## ##
  
 ifndef ALT_OBJ_DIR ifndef ALT_OBJ_DIR
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj32/$(DIR)
     else
     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
     endif
   else
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)32
 else else
     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)
 endif endif
   endif
  
 ############################################################################# #############################################################################
  
Line 118 
Line 126 
 else else
     BIN_DIR = $(HOME_DIR)/bin     BIN_DIR = $(HOME_DIR)/bin
 endif endif
   
   ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
     LIB_DIR = $(HOME_DIR)/lib32
   else
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
   endif
  
 # l10n # l10n
 # define the location for the compiled messages # define the location for the compiled messages
Line 223 
Line 236 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM222      PEGASUS_CIM_SCHEMA=CIM225
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 525 
Line 538 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
   
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      PLATFORM_FILE_32 = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT).mak
      ifeq ($(wildcard $(PLATFORM_FILE_32)), )
         $(error  PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT  environment variable must be set to one of\
           the following:$(VALID_PLATFORMS))
      endif
        DEFINES += -DPEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      ifdef PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR
          DEFINES += -DPEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR=\"$(PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR)\"
      endif
   endif
   
 # PEP 315 # PEP 315
 # Control whether compile with or without method entertexit trace code. # Control whether compile with or without method entertexit trace code.
 # A value other than 'true' or 'false' will cause a make error. # A value other than 'true' or 'false' will cause a make error.
Line 926 
Line 952 
   ## as defined for openslp   ## as defined for openslp
   ifeq ($(PEGASUS_USE_OPENSLP),true)   ifeq ($(PEGASUS_USE_OPENSLP),true)
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
       PEGASUS_USE_EXTERNAL_SLP=openslp        export PEGASUS_USE_EXTERNAL_SLP=openslp
       PEGASUS_USE_OPENSLP=       PEGASUS_USE_OPENSLP=
     else     else
       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \
Line 1026 
Line 1052 
     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \
       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)
   else   else
       PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)        export PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)
    endif    endif
 endif endif
 ############################################################################ ############################################################################
Line 1239 
Line 1265 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  ifndef 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 1489 
Line 1524 
       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
   endif   endif
 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.188  
changed lines
  Added in v.1.193
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2