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

Diff for /pegasus/mak/config.mak between version 1.5 and 1.10

version 1.5, 2001/03/04 21:36:38 version 1.10, 2001/04/30 15:54:27
Line 5 
Line 5 
 ## ##
 ################################################################################ ################################################################################
  
 ifdef PEGASUS_OS_TYPE  
   OS_TYPE = $(PEGASUS_OS_TYPE)  
 else  
   OS_TYPE = windows  
 endif  
   
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
Line 20 
Line 14 
         @ exit 1         @ exit 1
 endif endif
  
 ifdef PEGASUS_ACE_ROOT  VALID_PLATFORMS = WIN32_IX86_MSVC LINUX_IX86_GNU
   ACE_ROOT = $(subst \,/,$(PEGASUS_ACE_ROOT))  
 else  ifndef PEGASUS_PLATFORM
   ERROR = pegasus_ace_root_undefined    ERROR = pegasus_platform_undefined
 pegasus_ace_root_undefined:  pegasus_platform_undefined:
         @ echo PEGASUS_ACE_ROOT environment variable undefined          @ echo PEGASUS_PLATFORM environment variable undefined. Please set to\
               one of the following: $(VALID_PLATFORMS)
         @ exit 1         @ exit 1
 endif endif
  
   
 ################################################################################ ################################################################################
  
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
 REPOSITORY_ROOT = $(HOME_DIR)  REPOSITORY_ROOT = $(HOME_DIR)/repository
  
 LEX = flex LEX = flex
  
 YACC = bison YACC = bison
  
 ifeq ($(OS_TYPE),windows)  ################################################################################
 include $(ROOT)/mak/config-windows.mak  ##
 else  ## Attempt to include a platform configuration file:
 include $(ROOT)/mak/config-unix.mak  ##
   ################################################################################
   
   ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
     FOUND = true
   endif
   
   ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_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


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.10

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2