--- ray/src/util/Rmakefile	1996/01/18 11:25:09	2.20
+++ ray/src/util/Rmakefile	1998/09/03 10:50:38	2.30
@@ -1,5 +1,5 @@
 #
-# SCCSid "$SunId$ LBL"
+# SCCSid "$SunId$ SGI"
 # Radiance makefile for utility programs
 #
 
@@ -11,16 +11,18 @@ CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 
 CC = cc
 
+SPECIAL =
+
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = findglare xglaresrc glarendx rpiece rad ranimate vwright
+PROGS = findglare xglaresrc glarendx rpiece rad ranimate vwright getinfo vwrays
 
 all:	$(PROGS)
 
-install:	all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
-raddepend.csh trad.wsh objline.csh
+install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
+rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -30,14 +32,27 @@ raddepend.csh trad.wsh objline.csh
 	cp debugcal.csh $(INSTDIR)/debugcal
 	cp rlux.csh $(INSTDIR)/rlux
 	cp raddepend.csh $(INSTDIR)/raddepend
+	cp compamb.csh $(INSTDIR)/compamb
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
 		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
-		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
+		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
+		$(INSTDIR)/compamb
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
 
+ogl:	glrad
+	cp glrad $(INSTDIR)
+
+x10:
+
+aed:
+
+sgi:
+
+sun:
+
 scanner:	scanner.o
 	$(CC) $(CFLAGS) -o scanner scanner.o -lm
 
@@ -55,11 +70,11 @@ xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
 x11findwind.o -lrt -lX11 -lm
 
-rad:	rad.o loadvars.o
-	$(CC) $(CFLAGS) -o rad rad.o loadvars.o -lrt -lm
+rad:	rad.o
+	$(CC) $(CFLAGS) -o rad rad.o -lrt -lm
 
-ranimate:	ranimate.o loadvars.o netproc.o
-	$(CC) $(CFLAGS) -o ranimate ranimate.o loadvars.o netproc.o -lrt -lm
+ranimate:	ranimate.o netproc.o
+	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
 
 rpiece:	rpiece.o Version.o
 	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
@@ -67,6 +82,16 @@ rpiece:	rpiece.o Version.o
 vwright:	vwright.o
 	$(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
 
+vwrays:		vwrays.o
+	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
+
+getinfo:	getinfo.o
+	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
+
+glrad:	glrad.o
+	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
+-lX11 -lXext -lm
+
 contour:	contour.o
 	$(CC) $(CFLAGS) -o contour contour.o -lm
 
@@ -101,10 +126,18 @@ glareval.o xglaresrc.o:	../common/resolu.h
 
 xglaresrc.o:	../common/vfork.h
 
-rad.o ranimate.o loadvars.o:	vars.h
+rad.o ranimate.o:	../common/vars.h
 
 rad.o:	../common/paths.h
 
 ranimate.o netproc.o:	netproc.h
 
-ranimate.o:	../common/view.h
+netproc.o:	../common/paths.h
+
+rad.o ranimate.o:	../common/view.h
+
+glrad.o:	../common/radogl.h \
+../common/standard.h ../common/mat4.h ../common/fvect.h \
+../common/color.h ../common/object.h ../common/otypes.h ../common/lookup.h
+
+glrad.o:	glradicon.h ../common/view.h ../common/paths.h