--- ray/makeall	2003/12/11 23:42:54	1.11
+++ ray/makeall	2005/09/21 17:17:23	1.21
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.11 2003/12/11 23:42:54 greg Exp $
+# RCSid $Id: makeall,v 1.21 2005/09/21 17:17:23 greg Exp $
 # 
 # Make all the Radiance programs
 #
@@ -16,13 +16,13 @@ if ( "$1" == library ) then
 	echo "Set the environment variable RAYPATH=.:$ldir"
 	echo 'For C-shell users, put the following into ~/.cshrc'
 	echo "	setenv RAYPATH .:$ldir"
-	echo 'For Bourne shell users, put the following into $HOME/profile'
+	echo 'For Bourne shell users, put the following into $HOME/.profile'
 	echo "	RAYPATH=.:$ldir"
 	echo "	export RAYPATH"
 	echo ""
 	exit 0
 endif
-set srcdirs=( common meta cv gen ot rt px hd util cal )
+set srcdirs=( common rt meta cv gen ot px hd util cal )
 if ( "$1" == install ) then
 	cat << _EOF_
 
@@ -117,13 +117,13 @@ 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="bmalloc.o strcmp.o getpagesize.o"
+	set opt="-O"
+	set compat="strcmp.o"
 	breaksw
 case 2:			# HP workstation
 	set mach=""
-	set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
-	set compat="bmalloc.o getpagesize.o strcmp.o"
+	set opt="-O -Aa -D_HPUX_SOURCE"
+	set compat="strcmp.o"
 	set arch=hpux
 	breaksw
 case 3:			# Silicon Graphics
@@ -131,71 +131,70 @@ case 3:			# Silicon Graphics
 	switch (`uname -r`)
 	case 3.*:
 		set mach="-noprototypes"
-		set opt="-O -DSPEED=80"
+		set opt="-O"
 		set special="sgi"
-		set compat="malloc.o strcmp.o"
+		set compat="strcmp.o"
 		breaksw
 	case 4.*:
 		set mach=""
-		set opt="-O2 -DSPEED=100"
-		set compat="malloc.o strcmp.o"
+		set opt="-O2"
+		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 opt="-O2"
 		set special="ogl"
-		set compat="bmalloc.o strcmp.o"
+		set compat="strcmp.o"
 		breaksw
 	endsw
 	breaksw
 case 4:			# AIX
 	set opt="-O"
-	set compat="bmalloc.o erf.o strcmp.o"
+	set compat="erf.o strcmp.o"
 	set arch=PowerPC
 	breaksw
 case 5:			# BSDI BSD/386
 	set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
-	set opt="-O -DSPEED=100"
+	set opt="-O"
 	set arch=IBMPC
-	set compat="malloc.o erf.o strcmp.o"
+	set compat="erf.o strcmp.o"
 	breaksw
 case 6:			# Linux
-	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
-	set opt="-O2 -DSPEED=200"
+	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -Dfseeko=fseek -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
+	set opt="-O2"
 	set arch=IBMPC
-	set compat="bmalloc.o erf.o getpagesize.o"
+	set compat="erf.o"
 	set extras=CC=gcc
 	breaksw
 case 7:			# MacOS X
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-	set opt="-O2 -DSPEED=200"
+	set opt="-O2"
 	set arch=PowerPC
-	set compat="bmalloc.o"
 	set extras="CC=cc CONFIGURE_ARCH=powerpc"
 	set special="ogl"
 	breaksw
 case 8:			# FreeBSD
 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-	set opt="-O -DSPEED=200"
-	set compat="bmalloc.o erf.o"
-	set extras="CC=cc"
+	set opt="-O"
+	set compat="erf.o"
+	set extras='CC=cc MLIB="-lcompat -lm"'
 	set arch=IBMPC
 	breaksw
 case 9:			# 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="bmalloc.o erf.o getpagesize.o"
+	set compat="erf.o"
 	set extras="CC=gcc"
 	set special="ogl"
 	set esuffix=".exe"
 	breaksw
 case 10:			# Other
 	set opt="-O"
-	set compat="bmalloc.o erf.o strcmp.o"
+	set compat="erf.o strcmp.o"
 	echo -n "Are you using the GNU C compiler [n]? "
 	if ( "$<" =~ [yY]* ) then
 		set extras="CC=gcc"
@@ -261,17 +260,10 @@ if (! $inpath ) then
 	echo "Add $idir to the beginning of your execution path:"
 	echo 'For C-shell users, put the following into ~/.cshrc'
 	echo "	set path=( $idir "'$path )'
-	echo 'For Bourne shell users, put the following into $HOME/profile'
+	echo 'For Bourne shell users, put the following into $HOME/.profile'
 	echo "	PATH=$idir"':$PATH'
 	echo "	export PATH"
 endif
-if (! -d /usr/tmp) then
-	ln -s /tmp /usr/tmp
-	if ($status) then
-		echo ""
-		echo "IMPORTANT: Execute 'sudo ln -s /tmp /usr/tmp'"
-	endif
-endif
 else
 cd src
 foreach i ( $srcdirs )
@@ -284,7 +276,7 @@ cd ..
 foreach i ( $* )
 	if ( "$i" == clean ) then
 		echo "Removing library archives..."
-		rm -f src/lib/*.[ao]
+		rm -f src/lib/*.{a,o,la}
 	endif
 end
 echo "Done."