--- ray/src/util/Rmakefile	1991/03/19 14:12:32	1.4
+++ ray/src/util/Rmakefile	1991/07/15 12:52:25	1.12
@@ -6,38 +6,43 @@ MACH = -f68881 /usr/lib/libm.il -DIEEE -DBSD -DSTRUCTA
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT)
+CFLAGS = $(MACH) $(OPT) -I../common
 
 INSTDIR = /lumen/lumen/ray/bin.sun3
 
-PROGS = makedist swaprasheader findglare xglaresrc
+PROGS = makedist swaprasheader findglare xglaresrc glarendx
 
 all:	$(PROGS)
 
-install:	all objview.csh objpict.csh proj.csh
+install:	all objview.csh objpict.csh proj.csh glare.csh dayfact.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objpict.csh $(INSTDIR)/objpict
-	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict
+	cp glare.csh $(INSTDIR)/glare
+	cp dayfact.csh $(INSTDIR)/dayfact
+	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
+		$(INSTDIR)/glare $(INSTDIR)/dayfact
 
 clean:
-	rm -f *.o $(PROGS) core
+	set nonomatch; rm -f *.o $(PROGS) core
 
 scanner:	scanner.o
 	cc $(CFLAGS) -o scanner scanner.o -lm
 
-makedist:	makedist.o fvect.o setscan.o
-	cc $(CFLAGS) -o makedist makedist.o fvect.o setscan.o -lm
+makedist:	makedist.o setscan.o
+	cc $(CFLAGS) -o makedist makedist.o setscan.o ../common/librt.a -lm
 
-findglare:	findglare.o glareval.o glaresrc.o color.o fvect.o image.o \
-header.o resolu.o setscan.o
+findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	cc $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-color.o fvect.o image.o header.o resolu.o setscan.o -lm
+setscan.o ../common/librt.a -lm
 
-xglaresrc:	xglaresrc.o fvect.o image.o resolu.o header.o
-	cc $(CFLAGS) -o xglaresrc xglaresrc.o fvect.o image.o \
-header.o resolu.o -lm -lX11
+glarendx:	glarendx.o
+	cc $(CFLAGS) -o glarendx glarendx.o ../common/librt.a -lm
 
+xglaresrc:	xglaresrc.o x11findwind.o
+	cc $(CFLAGS) -o xglaresrc xglaresrc.o \
+x11findwind.o ../common/librt.a -lm -lX11
+
 contour:	contour.o
 	cc $(CFLAGS) -o contour contour.o -lm
 
@@ -54,10 +59,12 @@ t16anim.o pranim.o:	client/clnt.h
 setscan.o makedist.o:	setscan.h
 
 findglare.o glareval.o \
-glaresrc.o:	glare.h standard.h mat4.h fvect.h view.h color.h setscan.h
+glaresrc.o:	glare.h ../common/standard.h ../common/mat4.h \
+../common/fvect.h ../common/view.h ../common/color.h setscan.h
 
-image.o xglaresrc.o:	standard.h mat4.h fvect.h view.h
+glaresrc.o:	../common/linregr.h
 
-fvect.o:	fvect.h
+image.o xglaresrc.o:	../common/standard.h ../common/mat4.h \
+../common/fvect.h ../common/view.h
 
-resolu.o:	color.h
+swaprasheader.o:	../common/rasterfile.h