--- ray/makeall	2003/02/28 20:06:51	1.2
+++ ray/makeall	2003/11/25 18:23:11	1.10
@@ -1,9 +1,6 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.2 2003/02/28 20:06:51 greg Exp $
+# RCSid $Id: makeall,v 1.10 2003/11/25 18:23:11 greg Exp $
 # 
-#Added macosX 2001-04-11 by Jean Brange
-#Deleted obsolete systems 2001-04-18 by Greg Ward
-#
 # Make all the Radiance programs
 #
 if ( $#argv < 1 ) then
@@ -14,6 +11,7 @@ if ( $#argv < 1 ) then
 endif
 if ( "$1" == library ) then
 	source installib
+	cp -f src/*/*.{cal,tab,hex} $ldir
 	echo ""
 	echo "Set the environment variable RAYPATH=.:$ldir"
 	echo 'For C-shell users, put the following into ~/.cshrc'
@@ -50,7 +48,9 @@ again1:
 echo -n "Where do you want the executables [/usr/local/bin]? "
 set idir=$<
 (echo $idir) >/dev/null
-if ( $status ) goto again1
+if ( $status ) then
+	goto again1
+endif
 set idir=$idir
 if ( "$idir" == "" ) then
 	set idir=/usr/local/bin
@@ -72,8 +72,17 @@ if ( ! -d $idir/dev ) then
 		goto again1
 	endif
 endif
+set inpath=0
+foreach i ( $path )
+	if ( "$i" == "$idir" ) then
+		set inpath=1
+		break
+	endif
+end
 set rmake=$idir/rmake
-if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) goto gotrmake
+if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then
+	goto gotrmake
+endif
 set newrmake
 goto skiplicense
 cat << _EOF_
@@ -119,6 +128,7 @@ set opt=
 set mach=
 set compat=
 set extras=
+set esuffix=
 cat << _EOF_
 
 Please select your system type from the following list:
@@ -129,9 +139,10 @@ Please select your system type from the following list
 	4)	AIX (RS/6000)
 	5)	BSDI BSD/386
 	6)	Linux
-        7)      MacOS X
+	7)	MacOS X
 	8)	FreeBSD
-        9)      Other
+	9)	Cygwin
+	10)	Other
 
 _EOF_
 echo -n "Choice? "
@@ -139,22 +150,14 @@ set arch="$<"
 switch ("$arch")
 case 1:			# SPARC Station
 	set arch=sun
-	if ( `uname -r` =~ 4.* ) then
-		set mach="-fsingle -DBSD /usr/lib/libm.il -I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
-		set opt="-O -pipe -DSPEED=12"
-		set special="sun"
-		set compat="bmalloc.o strcmp.o"
-	else
-		set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
-		set opt="-O -DSPEED=80"
-		set special="ogl"
-		set compat="bmalloc.o strcmp.o getpagesize.o"
-	endif
+	set mach="-I/usr/openwin/include -L/usr/openwin/lib -DNOSTEREO"
+	set opt="-O -DSPEED=80"
+	set compat="bmalloc.o strcmp.o getpagesize.o"
 	breaksw
 case 2:			# HP workstation
 	set mach=""
 	set opt="-O -DSPEED=80 -Aa -D_HPUX_SOURCE"
-	set compat="malloc.o getpagesize.o strcmp.o"
+	set compat="bmalloc.o getpagesize.o strcmp.o"
 	set arch=hpux
 	breaksw
 case 3:			# Silicon Graphics
@@ -178,14 +181,14 @@ case 3:			# Silicon Graphics
 		set mach="-w"
 		set opt="-O2 -DSPEED=200"
 		set special="ogl"
-		set compat="malloc.o strcmp.o"
+		set compat="bmalloc.o strcmp.o"
 		breaksw
 	endsw
 	breaksw
 case 4:			# AIX
-	set mach="-Dvoid=char -D_NO_PROTO -DINCL_SEL_H"
 	set opt="-O"
-	set compat="bmalloc.o erf.o"
+	set compat="bmalloc.o erf.o strcmp.o"
+	set arch=PowerPC
 	breaksw
 case 5:			# BSDI BSD/386
 	set mach="-DBSD -L/usr/X11/lib -I/usr/X11/include"
@@ -194,34 +197,44 @@ case 5:			# BSDI BSD/386
 	set compat="malloc.o erf.o strcmp.o"
 	breaksw
 case 6:			# Linux
-	set mach="-Dlinux -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
+	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
 	set opt="-O2 -DSPEED=200"
 	set arch=IBMPC
 	set compat="bmalloc.o erf.o getpagesize.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 arch=PowerPC
-        set compat="bmalloc.o"
-        set extras="CC=cc CONFIGURE_ARCH=powerpc"
+case 7:			# MacOS X
+	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
+	set opt="-O2 -DSPEED=200"
+	set arch=PowerPC
+	set compat="bmalloc.o"
+	set extras="CC=cc CONFIGURE_ARCH=powerpc"
 	set special="ogl"
-        breaksw
+	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 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 arch=IBMPC
-        breaksw
-case 9:			# Other
+	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 arch=IBMPC
+	set compat="bmalloc.o erf.o getpagesize.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"
 	echo -n "Are you using the GNU C compiler [n]? "
 	if ( "$<" =~ [yY]* ) then
 		set extras="CC=gcc"
 	endif
+	set arch=other
 	breaksw
 default:
 	echo "Illegal choice\!"
@@ -229,36 +242,6 @@ default:
 	exit 1
 	breaksw
 endsw
-# We don't seem to have any more cramped machines out there, so...
-set mem="-DBIGMEM"
-if ( $?mem ) then
-	set mach="$mach $mem"
-else
-	echo -n "Does the target machine have more than 24 Mbytes of RAM? "
-	set ans="$<"
-	if ( "$ans" =~ [yY]* ) then
-		echo -n "More than 96 Mbytes? "
-		set ans="$<"
-		if ( "$ans" =~ [yY]* ) then
-			set mach="$mach -DBIGMEM"
-			set sizemod="huge models (100,000+ surfaces)"
-		else
-			set sizemod="very large models (30,000+ surfaces)"
-		endif
-	else
-		set sizemod="large models (10,000+ surfaces)"
-	endif
-endif
-# echo "Do you expect to be rendering $sizemod?"
-# echo -n '(Answering "yes" may adversly affect rendering time and geometric accuracy) '
-# set ans="$<"
-# if ( "$ans" =~ [yY]* ) then
-# 	set opt="$opt -DSMLFLT"
-# endif
-# echo -n "Do you have X10 support [n]? "
-# if ( "$<" =~ [yY]* ) then
-#	set special="$special x10"
-# endif
 source installib
 sed 's/[ 	]*$//' > $rmake << _EOF_
 #!/bin/sh
@@ -268,6 +251,7 @@ exec make "SPECIAL=$special" \
 	ARCH=$arch "COMPAT=$compat" \
 	INSTDIR=$idir \
 	LIBDIR=$ldir \
+	ESUFFIX=$esuffix \
 	$extras "\$@" -f Rmakefile
 _EOF_
 chmod 755 $rmake
@@ -306,12 +290,20 @@ else
 	echo "Done."
 endif
 cd ..
+if (! $inpath ) then
+	echo ""
+	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 "	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'"
-		echo ""
 	endif
 endif
 else
@@ -322,13 +314,13 @@ foreach i ( $srcdirs )
 	make -f Rmakefile $*
 	popd
 end
-echo "Done."
 cd ..
-endif
 foreach i ( $* )
 	if ( "$i" == clean ) then
 		echo "Removing library archives..."
-		rm -f src/lib/*.a
+		rm -f src/lib/*.[ao]
 	endif
 end
+echo "Done."
+endif
 exit 0