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

Diff for /pegasus/mak/config.mak between version 1.55 and 1.62

version 1.55, 2004/07/28 16:42:23 version 1.62, 2004/08/24 21:34:19
Line 9 
Line 9 
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 endif endif
  
   ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)
   else
 include $(ROOT)/env_var.status include $(ROOT)/env_var.status
   endif
  
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
Line 132 
Line 136 
  
 ifdef PEGASUS_CIM_SCHEMA ifdef PEGASUS_CIM_SCHEMA
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
     ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)
        CIM_SCHEMA_VER=
     else
   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif
 else else
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28
   CIM_SCHEMA_VER=28   CIM_SCHEMA_VER=28
Line 357 
Line 365 
   DEFINES+= -DPEGASUS_ENABLE_SLP   DEFINES+= -DPEGASUS_ENABLE_SLP
 endif endif
  
   # set PEGASUS_DEBUG into the DEFINES if it exists.
   # Note that this flag is the general separator between
   # debug compiles and non-debug compiles and controls both
   # the use of any debug options on compilers and linkers
   # and general debug support that we want to be turned on in
   # debug mode.
   ifdef PEGASUS_DEBUG
     DEFINES+= -DPEGASUS_DEBUG
   endif
   
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # Set compile flag to control compilation of CIMOM statistics
   ifdef PEGASUS_HAS_PERFINST
     FLAGS += -DPEGASUS_HAS_PERFINST
   endif
   
   ############################################################
   #
   # Set any vendor-specific compile flags
   #
   ############################################################
   
   ifdef PEGASUS_VENDOR_HP
     DEFINES+= -DPEGASUS_VENDOR_HP
   endif
   
  
 ############################################################ ############################################################
 # #
Line 374 
Line 407 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
   ifdef PEGASUS_USE_RELEASE_OPTIONS
     FLAGS += -DPEGASUS_USE_RELEASE_OPTIONS
   endif
   
   ifdef PEGASUS_USE_RELEASE_DIRS
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
     DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   endif
  
  
  


Legend:
Removed from v.1.55  
changed lines
  Added in v.1.62

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2