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

Diff for /pegasus/mak/config.mak between version 1.32.4.3 and 1.33

version 1.32.4.3, 2003/08/14 11:55:41 version 1.33, 2003/07/25 19:11:42
Line 23 
Line 23 
         @ exit 1         @ exit 1
 endif endif
  
 # l10n  
 ifdef ICU_ROOT  
     ICUROOT =  $(subst \,/,$(ICU_ROOT))  
 endif  
   
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
   TMP_DIR = $(subst \,/,$(PEGASUS_TMP))   TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
 else else
Line 51 
Line 46 
     HPUX_IA64_ACC \     HPUX_IA64_ACC \
     TRU64_ALPHA_DECCXX \     TRU64_ALPHA_DECCXX \
     SOLARIS_SPARC_GNU \     SOLARIS_SPARC_GNU \
     SOLARIS_SPARC_CC \  
     ZOS_ZSERIES_IBM \     ZOS_ZSERIES_IBM \
     NSK_NONSTOP_NMCPLUS     NSK_NONSTOP_NMCPLUS
  
Line 69 
Line 63 
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
  
 # l10n  
 # define the location for the compiled messages  
 MSG_ROOT = $(HOME_DIR)/msg  
   
 # 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_ROOT = $(REPOSITORY_DIR)/repository
Line 85 
Line 75 
 # Update the following two environment variables to # Update the following two environment variables to
 # change the version. # change the version.
  
 # The environment variable PEGASUS_CIM_SCHEMA can be used  CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27
 # to change the values of CIM_SCHEMA_DIR, CIM_SCHEMA_VER  CIM_SCHEMA_VER=27
 # and ALLOW_EXPERIMENTAL.  
 #  
 # To use the PEGASUS_CIM_SCHEMA variable the Schema mof  
 # files must be placed in the directory  
 # $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)  
 #  
 # The value of PEGASUS_CIM_SCHEMA must conform to the  
 # following syntax:  
 #  
 #        CIM[Prelim]<CIM_SCHEMA_VER>  
 #  
 # The string "Prelim" should be included if the  
 # Schema contains "Experimental" class definitions.  
 #  
 # The value of <CIM_SCHEMA_VER> must be the value  
 # of the version string included by the DMTF as  
 # part of the mof file names (e.g, CIM_Core27.mof).  
 # Therefore, for example, the value of <CIM_SCHEMA_VER>  
 # for CIM27 Schema directories MUST be 27.  
 #  
 # Examples of valid values of PEGASUS_CIM_SCHEMA  
 # include CIMPrelim27, CIM27, CIMPrelim28, and CIM28.  
 #  
 # Note the CIMPrelim271 would NOT be a valid value  
 # for PEGASUS_CIM_SCHEMA because the version string  
 # portion of the mof files (e.g., CIM_Core27.mof) in  
 # the CIMPrelimin271 directory is 27 not 271.  
  
 # ***** CIM_SCHEMA_DIR INFO **** # ***** CIM_SCHEMA_DIR INFO ****
 # If CIM_SCHEMA_DIR changes to use a preliminary schema which # If CIM_SCHEMA_DIR changes to use a preliminary schema which
Line 122 
Line 85 
 # experimental classes.  Since experimental classes exist the -aE # experimental classes.  Since experimental classes exist the -aE
 # option of the mof compiler needs to be set. # option of the mof compiler needs to be set.
 # ***** # *****
   ifeq ($(CIM_SCHEMA_DIR), $(PEGASUS_ROOT)/Schemas/CIMPrelim271)
 ifdef PEGASUS_CIM_SCHEMA  
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)  
   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))  
 else  
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27  
   CIM_SCHEMA_VER=27  
 endif  
   
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))  
    ALLOW_EXPERIMENTAL = -aE    ALLOW_EXPERIMENTAL = -aE
 else else
    ALLOW_EXPERIMENTAL =    ALLOW_EXPERIMENTAL =
Line 195 
Line 149 
   FOUND = true   FOUND = true
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
    FOUND = true    FOUND = true
Line 218 
Line 167 
         @ exit 1         @ exit 1
 endif endif
  
 ################################################################################  
 ##  
 ##  Set up any platform independent compile conditionals by adding them to  
 ##  precreated FLAGS parameter.  
 ##  Assumes that the basic flags have been setup in FLAGS.  
 ##  Assumes that compile time flags are controlled with -D CLI option.  
 ##  
 ################################################################################  
   
 # Setup the conditional compile for client displays.  
 #  
 ifdef PEGASUS_CLIENT_TRACE_ENABLE  
   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE  
 endif  
   
   
  
 ############################################################ ############################################################
 # #


Legend:
Removed from v.1.32.4.3  
changed lines
  Added in v.1.33

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2