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

Diff for /pegasus/mak/config.mak between version 1.64.2.5 and 1.69

version 1.64.2.5, 2005/04/06 23:44:13 version 1.69, 2005/01/20 02:47:29
Line 18 
Line 18 
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
   ERROR = pegasus_home_undefined      $(error PEGASUS_HOME environment variable undefined)
 pegasus_home_undefined:  
         @ echo PEGASUS_HOME environment variable undefined  
         @ exit 1  
 endif endif
  
 ifdef PEGASUS_ROOT ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else else
     ERROR = pegasus_root_undefined      $(error PEGASUS_ROOT environment variable undefined)
 pegasus_root_undefined:  
         @ echo PEGASUS_ROOT environment variable undefined  
         @ exit 1  
 endif endif
  
 # l10n # l10n
Line 50 
Line 44 
   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))   DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
 VALID_PLATFORMS = \  PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
     WIN32_IX86_MSVC \  TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
     LINUX_IX86_GNU \  VALID_PLATFORMS=$(subst .mak,, $(TEMP))
     LINUX_PPC_GNU \  
     LINUX_PPC64_GNU \  
     LINUX_IA64_GNU \  
     LINUX_ZSERIES_GNU \  
     LINUX_ZSERIES64_GNU \  
     AIX_RS_IBMCXX \  
     HPUX_PARISC_ACC \  
     HPUX_IA64_ACC \  
     TRU64_ALPHA_DECCXX \  
     SOLARIS_SPARC_GNU \  
     SOLARIS_SPARC_CC \  
     ZOS_ZSERIES_IBM \  
     NSK_NONSTOP_NMCPLUS \  
     DARWIN_PPC_GNU  
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
   ERROR = pegasus_platform_undefined      $(error PEGASUS_PLATFORM environment variable undefined. Please set to\
 pegasus_platform_undefined:          one of the following:$(VALID_PLATFORMS))
         @ echo PEGASUS_PLATFORM environment variable undefined. Please set to\  
             one of the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 206 
Line 183 
 ## ##
 ################################################################################ ################################################################################
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  PLATFORM_FILE = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifneq ($(wildcard $(PLATFORM_FILE)), )
   FOUND = true      include $(PLATFORM_FILE)
 endif  else
     $(error  PEGASUS_PLATFORM environment variable must be set to one of\
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)          the following:$(VALID_PLATFORMS))
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES64_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
    FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),NSK_NONSTOP_NMCPLUS)  
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
    FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)  
    include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
    FOUND = true  
 endif  
   
 ifneq ($(FOUND),true)  
   ERROR = pegasus_unknown_platform  
 pegasus_unknown_platform:  
         @ echo PEGASUS_PLATFORM environment variable must be set to one of\  
             the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 335 
Line 237 
         DEFINES+= -DPEGASUS_REMOVE_TRACE         DEFINES+= -DPEGASUS_REMOVE_TRACE
 endif endif
  
 # Allow PEGASUS_ASSERT statements to be disabled  
 ifdef PEGASUS_NOASSERTS  
     DEFINES += -DNDEBUG  
 endif  
   
 # PEP 123 use monitor2 (the default) or not # PEP 123 use monitor2 (the default) or not
 #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER
 DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER
Line 350 
Line 247 
 DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_CLIENT DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_CLIENT
 #endif #endif
  
   # Enable CMPI by default.
   #
       DEFINES += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER -DPEGASUS_CMPI_PROVIDER_INTERNAL
   
 # 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 370 
Line 271 
  DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION  DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
 # Allow ExecQuery functionality to be enabled  #
 ifndef PEGASUS_ENABLE_EXECQUERY  # PEP 193
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY  # The following flag need to be set to disable
   # CQL in indication subscriptions
   #
   ifdef PEGASUS_DISABLE_CQL
       DEFINES += -DPEGASUS_DISABLE_CQL
   endif
   
   #
   # PEP 186
   # Allow override of product name/version/status.  A file
   # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this
   # flag is defined.
   #
   ifdef PEGASUS_OVERRIDE_PRODUCT_ID
       DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID
 endif 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.
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
Line 437 
Line 353 
 endif endif
  
 DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\" 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.64.2.5  
changed lines
  Added in v.1.69
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2