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

Diff for /pegasus/mak/config.mak between version 1.76 and 1.82

version 1.76, 2005/02/04 15:32:58 version 1.82, 2005/02/24 20:11:54
Line 45 
Line 45 
 endif endif
  
 PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak) PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
 TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))  PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
 VALID_PLATFORMS=$(subst .mak,, $(TEMP))  VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
     $(error PEGASUS_PLATFORM environment variable undefined. Please set to\     $(error PEGASUS_PLATFORM environment variable undefined. Please set to\
Line 65 
Line 65 
  
 # define the location for the repository # define the location for the repository
 REPOSITORY_DIR = $(HOME_DIR) REPOSITORY_DIR = $(HOME_DIR)
 REPOSITORY_ROOT = $(REPOSITORY_DIR)/repository  REPOSITORY_NAME = repository
   REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
   
   # define the repository mode
   #       XML = XML format
   #       BIN = Binary format
   #
   REPOSITORY_MODE = XML
  
 # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER, # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,
 # are used to control the version of the CIM Schema # are used to control the version of the CIM Schema
Line 121 
Line 128 
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29
     CIM_SCHEMA_VER=28      CIM_SCHEMA_VER=
 endif endif
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
Line 304 
Line 311 
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
   # Allow ExecQuery functionality to be enabled
   ifndef PEGASUS_ENABLE_EXECQUERY
       DEFINES += -DPEGASUS_DISABLE_EXECQUERY
   endif
   
  
 # setup function to enable SLP functions in the Pegasus standard compile # setup function to enable SLP functions in the Pegasus standard compile
 # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code. # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
Line 369 
Line 381 
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib
 endif endif
  
   ifeq ($(OS),VMS)
    DEFINES += -DPEGASUS_DEST_LIB_DIR="""$(PEGASUS_DEST_LIB_DIR)"""
   else
 DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\" DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   endif
   
   ################################################################################
   ##
   ## Additional build flags passed in through environment variables.
   ## These flags are added to the compile/link commands.
   ##
   ################################################################################
   
   ifdef PEGASUS_EXTRA_CXX_FLAGS
       EXTRA_CXX_FLAGS = $(PEGASUS_EXTRA_CXX_FLAGS)
   endif
   
   ifdef PEGASUS_EXTRA_C_FLAGS
       EXTRA_C_FLAGS = $(PEGASUS_EXTRA_C_FLAGS)
   endif
   
   ifdef PEGASUS_EXTRA_LINK_FLAGS
       EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
   endif
   

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