(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.2 and 1.65

version 1.64.2.2, 2005/02/17 23:39:35 version 1.65, 2004/11/12 22:36:38
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 54 
Line 48 
     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 69 
Line 61 
     DARWIN_PPC_GNU     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 277 
Line 266 
 endif endif
  
 ifneq ($(FOUND),true) ifneq ($(FOUND),true)
   ERROR = pegasus_unknown_platform    $(error  PEGASUS_PLATFORM environment variable must be set to one of\
 pegasus_unknown_platform:          the following: $(VALID_PLATFORMS))
         @ echo PEGASUS_PLATFORM environment variable must be set to one of\  
             the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 423 
Line 409 
 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.2  
changed lines
  Added in v.1.65

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2