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

Diff for /pegasus/mak/config.mak between version 1.60 and 1.64.2.1

version 1.60, 2004/08/12 12:41:11 version 1.64.2.1, 2005/02/16 22:12:42
Line 9 
Line 9 
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 endif endif
  
   ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)
   else
 include $(ROOT)/env_var.status include $(ROOT)/env_var.status
   endif
  
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
Line 403 
Line 407 
 # #
 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.60  
changed lines
  Added in v.1.64.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2