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

Diff for /pegasus/mak/config.mak between version 1.23 and 1.48

version 1.23, 2003/03/12 17:08:52 version 1.48, 2004/05/13 13:10:46
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
   TMP_DIR = .   TMP_DIR = .
 endif endif
  
   ifdef PEGASUS_DISPLAYCONSUMER_DIR
     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))
   else
     DISPLAYCONSUMER_DIR = $(subst \,/,$(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 \     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 \
       DARWIN_PPC_GNU
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
   ERROR = pegasus_platform_undefined   ERROR = pegasus_platform_undefined
Line 55 
Line 70 
 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 67 
Line 86 
 # Update the following two environment variables to # Update the following two environment variables to
 # change the version. # change the version.
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIMPrelim271  # The environment variable PEGASUS_CIM_SCHEMA can be used
   # to change the values of CIM_SCHEMA_DIR, CIM_SCHEMA_VER
   # 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 ****
   # 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.
   # *****
   
   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 CIM_SCHEMA_VER=27
   endif
   
   ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
      ALLOW_EXPERIMENTAL = -aE
   else
      ALLOW_EXPERIMENTAL =
   endif
  
 LEX = flex LEX = flex
  
Line 88 
Line 156 
   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 118 
Line 196 
   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 128 
Line 211 
    FOUND = true    FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
      include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
      FOUND = true
   endif
   
 ifneq ($(FOUND),true) ifneq ($(FOUND),true)
   ERROR = pegasus_unknown_platform   ERROR = pegasus_unknown_platform
 pegasus_unknown_platform: pegasus_unknown_platform:
Line 136 
Line 224 
         @ 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
   
   # do not compile trace code. sometimes it causes problems debugging
   ifdef PEGASUS_REMOVE_TRACE
           DEFINES+= -DPEGASUS_REMOVE_TRACE
   endif
   
   # PEP 123 use monitor2 (the default) or not
   #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER
   DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER
   #endif
   
   #BUG 1170 Monitor2 Client Workaround
   #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT
   DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_CLIENT
   #endif
   
   # PEP 161
   # Control whether utf-8 filenames are supported by the repository
   ifdef PEGASUS_SUPPORT_UTF8_FILENAME
           DEFINES+= -DPEGASUS_SUPPORT_UTF8_FILENAME
   
           # Control whether utf-8 filenames in the repository are escaped
           ifdef PEGASUS_REPOSITORY_ESCAPE_UTF8
           DEFINES+= -DPEGASUS_REPOSITORY_ESCAPE_UTF8
           endif
   endif
   
   # is the pegasus slp classes
   ifdef PEGASUS_SLP_CLASSES
           DEFINES+= -DPEGASUS_SLP_CLASSES
   endif
   
   # setup function to enable SLP functions in the Pegasus standard compile
   # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
   ifdef PEGASUS_ENABLE_SLP
     DEFINES+= -DPEGASUS_ENABLE_SLP
   endif
   
   # compile in the experimental APIs
   DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
   
  
 ############################################################ ############################################################
 # #
Line 150 
Line 293 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
   
   
   

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