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

Diff for /pegasus/mak/config.mak between version 1.74 and 1.81

version 1.74, 2005/02/01 01:26:15 version 1.81, 2005/02/16 00:10:07
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 298 
Line 305 
     endif     endif
 endif endif
  
   # PEP 211
   # Controls object normalization support.
   ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
       DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
   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.
   # NOTE. Effective with Bug # 2633 some platforms now enable SLP.
   # To see which platforms look for platform make files that set
   # the variable PEGASUS_ENABLE_SLP
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
 endif endif
Line 360 
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.74  
changed lines
  Added in v.1.81

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2