(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.64.2.6

version 1.32.4.3, 2003/08/14 11:55:41 version 1.64.2.6, 2005/08/03 04:13:42
Line 5 
Line 5 
 ## ##
 ################################################################################ ################################################################################
  
   ifndef ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   endif
   
   ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)
   else
     include $(ROOT)/env_var.status
   endif
   
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
Line 37 
Line 47 
 ifdef PEGASUS_DISPLAYCONSUMER_DIR ifdef PEGASUS_DISPLAYCONSUMER_DIR
   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_DISPLAYCONSUMER_DIR))
 else else
   DISPLAYCONSUMER_DIR = $(PEGASUS_HOME)    DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
 VALID_PLATFORMS = \ VALID_PLATFORMS = \
     WIN32_IX86_MSVC \     WIN32_IX86_MSVC \
     LINUX_IX86_GNU \     LINUX_IX86_GNU \
     LINUX_PPC_GNU \     LINUX_PPC_GNU \
       LINUX_PPC64_GNU \
     LINUX_IA64_GNU \     LINUX_IA64_GNU \
     LINUX_ZSERIES_GNU \     LINUX_ZSERIES_GNU \
       LINUX_ZSERIES64_GNU \
     AIX_RS_IBMCXX \     AIX_RS_IBMCXX \
     HPUX_PARISC_ACC \     HPUX_PARISC_ACC \
     HPUX_IA64_ACC \     HPUX_IA64_ACC \
Line 53 
Line 65 
     SOLARIS_SPARC_GNU \     SOLARIS_SPARC_GNU \
     SOLARIS_SPARC_CC \     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 125 
Line 138 
  
 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/CIM27    CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28
   CIM_SCHEMA_VER=27    CIM_SCHEMA_VER=28
 endif endif
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
Line 141 
Line 158 
  
 ################################################################################ ################################################################################
 ## ##
   ## Default installation paths
   ##
   ################################################################################
   
   ## 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
   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
   DEST_ETC_DIR = $(SYSCONF_PREFIX)/pegasus
   endif
   
   ifndef DEST_MAN_DIR
   DEST_MAN_DIR = $(PREFIX)/man
   endif
   
   ifndef DEST_VAR_DIR
   DEST_VAR_DIR = $(LOCAL_STATE_PREFIX)
   endif
   
   ################################################################################
   ##
 ## Attempt to include a platform configuration file: ## Attempt to include a platform configuration file:
 ## ##
 ################################################################################ ################################################################################
Line 160 
Line 221 
   FOUND = true   FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),LINUX_PPC64_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
Line 170 
Line 236 
   FOUND = true   FOUND = true
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES64_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 210 
Line 281 
    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 220 
Line 296 
  
 ################################################################################ ################################################################################
 ## ##
   ## 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 233 
Line 335 
   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE   DEFINES+= -DPEGASUS_CLIENT_TRACE_ENABLE
 endif endif
  
   # do not compile trace code. sometimes it causes problems debugging
   ifdef PEGASUS_REMOVE_TRACE
           DEFINES+= -DPEGASUS_REMOVE_TRACE
   endif
   
   # Allow PEGASUS_ASSERT statements to be disabled
   ifdef PEGASUS_NOASSERTS
       DEFINES += -DNDEBUG
   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
   
   #
   # PEP 142
   # The following flag need to be set to enable
   # user group authorization functionality.
   #
   ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION
    DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
   endif
   
   # Allow ExecQuery functionality to be enabled
   ifndef PEGASUS_ENABLE_EXECQUERY
       DEFINES += -DPEGASUS_DISABLE_EXECQUERY
   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
   
   # 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
   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 248 
Line 428 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
   ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
     FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
   endif
   
   ifdef PEGASUS_USE_RELEASE_DIRS
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
   endif
   
   # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
   ifndef PEGASUS_DEST_LIB_DIR
     PEGASUS_DEST_LIB_DIR = lib
   endif
   
   DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   
   ################################################################################
   ##
   ## Additional build flags passed in through environment variables.
   ## These flags are added to the compile/link commands.
   ##
   ################################################################################
  
   ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
     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
   endif


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2