[Teem-commit] teem/src/make errorCheck.mk,1.8,1.9

[<kin...@us...>]

Update of /cvsroot/teem/teem/src/make
In directory sc8-pr-cvs1:/tmp/cvs-serv7394/src/make

Modified Files:
	errorCheck.mk 
Log Message:
TEEM_ARCH linux.64 has split into linux.ia64 and linux.amd64



Index: errorCheck.mk
===================================================================
RCS file: /cvsroot/teem/teem/src/make/errorCheck.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** errorCheck.mk	18 Sep 2003 05:32:21 -0000	1.8
--- errorCheck.mk	20 Dec 2003 08:23:15 -0000	1.9
***************
*** 24,28 ****
  
  # all the architectures currently supported
! KNOWN_ARCH = irix6.n32 irix6.64 linux.32 linux.64 \
    darwin.32 darwin.64 cygwin solaris aix
  
--- 24,28 ----
  
  # all the architectures currently supported
! KNOWN_ARCH = irix6.n32 irix6.64 linux.32 linux.ia64 linux.amd64 \
    darwin.32 darwin.64 cygwin solaris aix
  
***************
*** 43,48 ****
  $(warning *)\
  $(warning * Sorry: the $(TEEM_ARCH) TEEM_ARCH has split into:)\
! $(warning * "linux.32" for 32-bit machines)\
! $(warning * "linux.64" for 64-bit machines)\
  $(warning *)\
  $(warning *)\
--- 43,60 ----
  $(warning *)\
  $(warning * Sorry: the $(TEEM_ARCH) TEEM_ARCH has split into:)\
! $(warning * "linux.32" for 32-bit)\
! $(warning * "linux.ia64" for 64-bit Itanium (Intel))\
! $(warning * "linux.amd64" for 64-bit Athlon (AMD))\
! $(warning *)\
! $(warning *)\
! $(error Make quitting))
! 
! # see if they were looking for linux.64
! checkArchLinux64 = $(if $(findstring $(TEEM_ARCH),linux.64),\
! $(warning *)\
! $(warning *)\
! $(warning * Sorry: the $(TEEM_ARCH) TEEM_ARCH has split into:)\
! $(warning * "linux.ia64" for 64-bit Itanium (Intel))\
! $(warning * "linux.amd64" for 64-bit Athlon (AMD))\
  $(warning *)\
  $(warning *)\
***************
*** 54,59 ****
  $(warning *)\
  $(warning * Sorry: the "darwin" TEEM_ARCH has split into:)\
! $(warning * "darwin.32" for 32-bit machines)\
! $(warning * "darwin.64" for 64-bit machines)\
  $(warning *)\
  $(warning *)\
--- 66,71 ----
  $(warning *)\
  $(warning * Sorry: the "darwin" TEEM_ARCH has split into:)\
! $(warning * "darwin.32" for 32-bit Macs (G4))\
! $(warning * "darwin.64" for 64-bit Macs (G5))\
  $(warning *)\
  $(warning *)\