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

Diff for /pegasus/mak/config.mak between version 1.20 and 1.31.4.3

version 1.20, 2002/07/15 06:22:11 version 1.31.4.3, 2003/08/14 20:03:46
Line 23 
Line 23 
         @ exit 1         @ exit 1
 endif endif
  
   ifdef PEGASUS_TMP
     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
   else
     TMP_DIR = .
   endif
   
   ifdef PEGASUS_DISPLAYCONSUMER_DIR
     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))
   else
     DISPLAYCONSUMER_DIR = $(PEGASUS_HOME)
   endif
   
 VALID_PLATFORMS = \ VALID_PLATFORMS = \
     WIN32_IX86_MSVC \     WIN32_IX86_MSVC \
     LINUX_IX86_GNU \     LINUX_IX86_GNU \
       LINUX_PPC_GNU \
     LINUX_IA64_GNU \     LINUX_IA64_GNU \
       LINUX_ZSERIES_GNU \
     AIX_RS_IBMCXX \     AIX_RS_IBMCXX \
     HPUX_PARISC_ACC \     HPUX_PARISC_ACC \
       HPUX_IA64_ACC \
     TRU64_ALPHA_DECCXX \     TRU64_ALPHA_DECCXX \
     SOLARIS_SPARC_GNU \     SOLARIS_SPARC_GNU \
     ZOS_ZSERIES_IBM \     ZOS_ZSERIES_IBM \
Line 44 
Line 59 
  
 ################################################################################ ################################################################################
  
 ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)  
    OBJ_DIR = $(HOME_DIR)/obj/$(DIR)  
    BIN_DIR = $(HOME_DIR)/bin  
    LIB_DIR = $(HOME_DIR)/lib  
    REPOSITORY_DIR = $(HOME_DIR)  
    REPOSITORY_ROOT = $(REPOSITORY_DIR)/repository  
 else  
    OBJ_DIR = $(HOME_DIR)/obj/$(DIR)    OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
    BIN_DIR = $(HOME_DIR)/bin    BIN_DIR = $(HOME_DIR)/bin
    LIB_DIR = $(HOME_DIR)/lib    LIB_DIR = $(HOME_DIR)/lib
Line 58 
Line 66 
    # 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
   
   # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,
   # are used to control the version of the CIM Schema
   # loaded into the Pegasus Internal, InterOp,
   # root/cimv2 and various test namespaces.
   #
   # Update the following two environment variables to
   # change the version.
   
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27
   CIM_SCHEMA_VER=27
   
   # ***** CIM_SCHEMA_DIR INFO ****
   # If CIM_SCHEMA_DIR changes to use a preliminary schema which
   # has experimentals make sure and change the path below to appopriate
   # directory path.  Example:  CIMPrelim271 is preliminary and has
   # experimental classes.  Since experimental classes exist the -aE
   # option of the mof compiler needs to be set.
   # *****
   ifeq ($(CIM_SCHEMA_DIR), $(PEGASUS_ROOT)/Schemas/CIMPrelim271)
   ALLOW_EXPERIMENTAL = -aE
   else
   ALLOW_EXPERIMENTAL =
 endif endif
  
 LEX = flex LEX = flex
Line 78 
Line 109 
   FOUND = true   FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
     FOUND = true
   endif
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   FOUND = true   FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
     FOUND = true
   endif
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   FOUND = true   FOUND = true
Line 93 
Line 134 
   FOUND = true   FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
     FOUND = true
   endif
   
 ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX) ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX)
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   FOUND = true   FOUND = true
Line 121 
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
   
   
  
 ############################################################ ############################################################
 # #
Line 135 
Line 197 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
   
   
   


Legend:
Removed from v.1.20  
changed lines
  Added in v.1.31.4.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2