--- ray/src/util/Rmakefile	1992/08/06 17:16:30	2.5
+++ ray/src/util/Rmakefile	1993/12/09 17:32:14	2.9
@@ -10,47 +10,54 @@ CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 
 CC = cc
 
+MLIB = -lm
+
 INSTDIR = /usr/local/bin
 
-PROGS = findglare xglaresrc glarendx rpiece
+PROGS = findglare xglaresrc glarendx rpiece rad
 
 all:	$(PROGS)
 
-install:	all objview.csh objpict.csh proj.csh glare.csh dayfact.csh
+install:	all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objpict.csh $(INSTDIR)/objpict
 	cp glare.csh $(INSTDIR)/glare
 	cp dayfact.csh $(INSTDIR)/dayfact
 	cp debugcal.csh $(INSTDIR)/debugcal
+	cp rlux.csh $(INSTDIR)/rlux
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
-		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal
+		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
+		$(INSTDIR)/rlux
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
 
 scanner:	scanner.o
-	$(CC) $(CFLAGS) -o scanner scanner.o -lm
+	$(CC) $(CFLAGS) -o scanner scanner.o $(MLIB)
 
 makedist:	makedist.o setscan.o
-	$(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
+	$(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt $(MLIB)
 
 findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-setscan.o -lrt -lm
+setscan.o -lrt $(MLIB)
 
 glarendx:	glarendx.o
-	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt $(MLIB)
 
 xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
-x11findwind.o -lrt -lX11 -lm
+x11findwind.o -lrt -lX11 $(MLIB)
 
+rad:	rad.o
+	$(CC) $(CFLAGS) -o rad rad.o -lrt $(MLIB)
+
 rpiece:	rpiece.o Version.o
-	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
+	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt $(MLIB)
 
 contour:	contour.o
-	$(CC) $(CFLAGS) -o contour contour.o -lm
+	$(CC) $(CFLAGS) -o contour contour.o $(MLIB)
 
 pranim:	pranim.o client/libclient.a
 	$(CC) $(CFLAGS) -o pranim pranim.o \
@@ -72,8 +79,8 @@ glaresrc.o:	../common/linregr.h
 
 rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
-rpiece.o xglaresrc.o:	../common/standard.h ../common/mat4.h \
-../common/fvect.h
+rad.o rpiece.o xglaresrc.o:	../common/standard.h \
+../common/mat4.h ../common/fvect.h
 
 xglaresrc.o:	../common/view.h