pegasus/mak/config.mak - diff

Return to config.mak CVS log

Up to [Pegasus] / pegasus / mak

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

version 1.5, 2001/03/04 21:36:38

version 1.8, 2001/04/13 21:45:00

Line 5

################################################################################

ifdef PEGASUS_OS_TYPE

OS_TYPE = $(PEGASUS_OS_TYPE)

else

OS_TYPE = windows

endif

ifdef PEGASUS_HOME

HOME_DIR = $(subst \,/,$(PEGASUS_HOME))

else

Line 20

Line 14

@ exit 1

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

endif

################################################################################

OBJ_DIR = $(HOME_DIR)/obj/$(DIR)

Line 41

Line 35

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/config-$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),linux_iX86_gnu)

include $(ROOT)/mak/config-$(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

Legend:

Removed from v.1.5
changed lines
	Added in v.1.8

No CVS admin address has been configured