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

Diff for /pegasus/mak/config.mak between version 1.70 and 1.91

version 1.70, 2005/01/22 18:16:24 version 1.91, 2005/04/29 23:06:05
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 63 
Line 63 
 # define the location for the compiled messages # define the location for the compiled messages
 MSG_ROOT = $(HOME_DIR)/msg MSG_ROOT = $(HOME_DIR)/msg
  
   #############################################################################
   ##  The following REPOSITORY_XXX variables are only used within the
   ## makefiles for building the repository (cimmofl) and running the tests.
   ## They have no effect on CIMconfig initial startup configuration.
   
   #
 # define the location for the repository # define the location for the repository
   #
   # NOTE: There is another variable efined in many of the test makefiles
   # called REPOSITORYDIR. It is a local variable in each of those Makefiles
   # to localally control where the temporay small repository they
   # build, use and then delete is located. Most of the time it is set to TMP_DIR.
   #
   
 REPOSITORY_DIR = $(HOME_DIR) REPOSITORY_DIR = $(HOME_DIR)
 REPOSITORY_ROOT = $(REPOSITORY_DIR)/repository  
   #
   # WARNING: The REPOSITORY_NAME varible is not used by all the test,
   # many of them are still hardcoded to "repository".  What this means
   # is that you can change the repository name and build it. But you
   # cannot run the test without many of them failing
   #
   
   REPOSITORY_NAME = repository
   
   
   REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
   
   # define the repository mode
   #       XML = XML format
   #       BIN = Binary format
   #
   ifndef PEGASUS_REPOSITORY_MODE
      ## set to default value
      REPOSITORY_MODE = XML
   else
      ## validate assigned value
      ifeq ($(PEGASUS_REPOSITORY_MODE),XML)
          REPOSITORY_MODE = XML
      else
        ifeq ($(PEGASUS_REPOSITORY_MODE),BIN)
         REPOSITORY_MODE = BIN
        else
         $(error PEGASUS_REPOSITORY_MODE ($(PEGASUS_REPOSITORY_MODE)) \
                    is invalid. It must be set to either XML or BIN)
        endif
      endif
   endif
   
   
   ###########################################################################
  
 # 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 121 
Line 169 
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29
     CIM_SCHEMA_VER=28      CIM_SCHEMA_VER=
 endif endif
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
Line 133 
Line 181 
  
 LEX = flex LEX = flex
  
 ################################################################################  ## ========================================================================
   ## DIFFSORT function definition
   ## Here is an example using the DIFFSORT function:
 ## ##
 ## Default installation paths  ## difftest: FORCE
   ##      @ test > result
   ##      @ $(call DIFFSORT,result,standard_result)
   ##      @ $(ECHO) +++++ all test passed
 ## ##
 ################################################################################  
   
 ## Default values to install files when 'make install' is invoked.  
   
 ifndef PREFIX  
     PREFIX=$(HOME_DIR)/install  
 endif  
   
 ifndef SYSCONF_PREFIX  
     SYSCONF_PREFIX=$(PREFIX)/etc  
 endif  
  
 ifndef LOCAL_STATE_PREFIX  define NL
     LOCAL_STATE_PREFIX=$(PREFIX)/var/  
 endif  
   
 ifndef DEST_LIB_DIR  
     DEST_LIB_DIR = $(PREFIX)/lib  
 endif  
   
 ifndef DEST_BIN_DIR  
     DEST_BIN_DIR = $(PREFIX)/bin  
 endif  
  
 ifndef DEST_SBIN_DIR  
     DEST_SBIN_DIR = $(PREFIX)/sbin  
 endif  
  
 ifndef DEST_ETC_DIR  endef
     DEST_ETC_DIR = $(SYSCONF_PREFIX)/pegasus  
 endif  
  
 ifndef DEST_MAN_DIR  DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \
     DEST_MAN_DIR = $(PREFIX)/man  $(SORT) $(2) > $(2).tmp $(NL) \
 endif  $(DIFF) $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
  
 ifndef DEST_VAR_DIR  
     DEST_VAR_DIR = $(LOCAL_STATE_PREFIX)  
 endif  
  
 ################################################################################ ################################################################################
 ## ##
Line 193 
Line 219 
  
 ################################################################################ ################################################################################
 ## ##
 ## Default installation macros  
 ##  
 ################################################################################  
   
 ## INSTALL_LIB creates the destination directory if missing,  
 ## copies the library and generates the symbolic link.  
   
 ifndef INSTALL_LIBRARY  
     ## These macros are also defined in the Platform_<*>.mak files.  
     INSTALL_LIBRARY =  $(MKDIRHIER) $(DEST_LIB_DIR); $(COPY) $(FULL_LIB) $(DEST_LIB_DIR)  
 endif  
   
 ## INSTALL_PROGRAM creates the destination directory if missing and  
 ## copies the file.  
 ifndef INSTALL_PROGRAM  
     INSTALL_PROGRAM = $(MKDIRHIER) $(DEST_BIN_DIR); $(COPY) $(FULL_PROGRAM) $(DEST_BIN_DIR)  
 endif  
 ## INSTALL_PROGRAM creates the destination directory if missing and  
 ## copies the file.  
 ifndef INSTALL_SBIN_PROGRAM  
     INSTALL_SBIN_PROGRAM = $(MKDIRHIER) $(DEST_SBIN_DIR);  $(COPY) $(FULL_PROGRAM) $(DEST_SBIN_DIR)  
 endif  
 ## The rest of the macros for DEST_MAN_DIR, DEST_VAR_DIR, etc. are not provided in this file.  
   
 ################################################################################  
 ##  
 ##  Set up any platform independent compile conditionals by adding them to ##  Set up any platform independent compile conditionals by adding them to
 ##  precreated FLAGS parameter. ##  precreated FLAGS parameter.
 ##  Assumes that the basic flags have been setup in FLAGS. ##  Assumes that the basic flags have been setup in FLAGS.
Line 232 
Line 232 
     DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE     DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE
 endif endif
  
   # Allow PEGASUS_ASSERT statements to be disabled.
   ifdef PEGASUS_NOASSERTS
       DEFINES += -DNDEBUG
   endif
   
 # do not compile trace code. sometimes it causes problems debugging # do not compile trace code. sometimes it causes problems debugging
 ifdef PEGASUS_REMOVE_TRACE ifdef PEGASUS_REMOVE_TRACE
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif 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 # PEP 161
 # Control whether utf-8 filenames are supported by the repository # Control whether utf-8 filenames are supported by the repository
 ifdef PEGASUS_SUPPORT_UTF8_FILENAME ifdef PEGASUS_SUPPORT_UTF8_FILENAME
Line 287 
Line 281 
     DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID     DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID
 endif endif
  
   #
   # PEP 197
   # Allow the Provider User Context feature to be disabled.
   #
   ifdef PEGASUS_DISABLE_PROV_USERCTXT
       DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT
   else
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
       endif
   endif
   
   # Bug 2147
   # Allow local domain socket usage to be disabled.
   ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
       DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
   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
   
   # Allow System Log Handler to be enabled
   ifdef PEGASUS_ENABLE_SYSTEM_LOG_HANDLER
     DEFINES += -DPEGASUS_ENABLE_SYSTEM_LOG_HANDLER
   endif
   
   # Allow Email Handler to be enabled
   ifdef PEGASUS_ENABLE_EMAIL_HANDLER
     DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
   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 302 
Line 346 
 # debug mode. # debug mode.
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
     DEFINES += -DPEGASUS_DEBUG     DEFINES += -DPEGASUS_DEBUG
   
       # Indications debugging options
       ifdef PEGASUS_INDICATION_PERFINST
           DEFINES += -DPEGASUS_INDICATION_PERFINST
       endif
   
       ifdef PEGASUS_INDICATION_HASHTRACE
           DEFINES += -DPEGASUS_INDICATION_HASHTRACE
       endif
 endif 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 # Set compile flag to control compilation of CIMOM statistics
 ifdef PEGASUS_HAS_PERFINST  ifdef PEGASUS_DISABLE_PERFINST
     FLAGS += -DPEGASUS_HAS_PERFINST      FLAGS += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
 ############################################################ ############################################################
Line 349 
Line 402 
     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.70  
changed lines
  Added in v.1.91
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2