--- ray/makeall	2005/08/09 21:21:14	1.19
+++ ray/makeall	2010/11/29 17:22:44	1.25
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.19 2005/08/09 21:21:14 greg Exp $
+# RCSid $Id: makeall,v 1.25 2010/11/29 17:22:44 greg Exp $
 # 
 # Make all the Radiance programs
 #
@@ -100,15 +100,11 @@ cat << _EOF_
 Please select your system type from the following list:
 
 	1)	Sun Solaris
-	2)	HP workstation
-	3)	Silicon Graphics
-	4)	AIX (RS/6000)
-	5)	BSDI BSD/386
-	6)	Linux
-	7)	MacOS X
-	8)	FreeBSD
-	9)	Cygwin
-	10)	Other
+	2)	Linux
+	3)	MacOS X
+	4)	FreeBSD
+	5)	Cygwin
+	6)	Other
 
 _EOF_
 echo -n "Choice? "
@@ -117,87 +113,47 @@ switch ("$arch")
 case 1:			# SPARC Station
 	set arch=sun
 	set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
-	set opt="-O -DSPEED=80"
-	set compat="strcmp.o"
-	breaksw
-case 2:			# HP workstation
-	set mach=""
-	set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
-	set compat="strcmp.o"
-	set arch=hpux
-	breaksw
-case 3:			# Silicon Graphics
-	set arch=sgi
-	switch (`uname -r`)
-	case 3.*:
-		set mach="-noprototypes"
-		set opt="-O -DSPEED=80"
-		set special="sgi"
-		set compat="strcmp.o"
-		breaksw
-	case 4.*:
-		set mach=""
-		set opt="-O2 -DSPEED=100"
-		set compat="strcmp.o"
-		set extras='"MLIB=-lfastm -lm"'
-		breaksw
-	default:	# 5.x or later
-		ln -s `which wish` $idir/wish4.0
-		set path=($idir $path)
-		set mach="-w"
-		set opt="-O2 -DSPEED=200"
-		set special="ogl"
-		set compat="strcmp.o"
-		breaksw
-	endsw
-	breaksw
-case 4:			# AIX
 	set opt="-O"
-	set compat="erf.o strcmp.o"
-	set arch=PowerPC
+	set compat="strcmp.o timegm.o"
 	breaksw
-case 5:			# BSDI BSD/386
-	set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
-	set opt="-O -DSPEED=100"
-	set arch=IBMPC
-	set compat="erf.o strcmp.o"
-	breaksw
-case 6:			# Linux
+case 2:			# Linux
 	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
-	set opt="-O2 -DSPEED=200"
+	set opt="-O2"
 	set arch=IBMPC
 	set compat="erf.o"
 	set extras=CC=gcc
 	breaksw
-case 7:			# MacOS X
+case 3:			# MacOS X
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-	set opt="-O2 -DSPEED=200"
-	set arch=PowerPC
-	set extras="CC=cc CONFIGURE_ARCH=powerpc"
+	set opt="-O2"
+	set arch=Intel
+	set extras="CC=cc CONFIGURE_ARCH=i386"
 	set special="ogl"
 	breaksw
-case 8:			# FreeBSD
+case 4:			# FreeBSD
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-	set opt="-O -DSPEED=200"
+	set opt="-O"
 	set compat="erf.o"
 	set extras='CC=cc MLIB="-lcompat -lm"'
 	set arch=IBMPC
 	breaksw
-case 9:			# Cygwin
+case 5:			# Cygwin
 	set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
-	set opt="-O2 -DSPEED=200"
+	set opt="-O2"
 	set arch=IBMPC
 	set compat="erf.o"
 	set extras="CC=gcc"
 	set special="ogl"
 	set esuffix=".exe"
 	breaksw
-case 10:			# Other
+case 6:			# Other
 	set opt="-O"
 	set compat="erf.o strcmp.o"
 	echo -n "Are you using the GNU C compiler [n]? "
 	if ( "$<" =~ [yY]* ) then
 		set extras="CC=gcc"
+	else
+		set compat="$compat timegm.o"
 	endif
 	set arch=other
 	breaksw