--- ray/src/rt/Rmakefile	1990/12/13 11:07:28	1.37
+++ ray/src/rt/Rmakefile	1991/03/08 12:55:36	1.40
@@ -5,7 +5,7 @@
 #
 
 OPT = -O -pipe
-MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
+MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
 CFLAGS = $(MACH) $(OPT)
 CC = cc
 LINT = lint
@@ -16,7 +16,7 @@ LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DF
 # The following are user-definable:
 #
 DESTDIR = .
-INSTDIR = /usr/local/ray
+INSTDIR = /lumen/lumen/ray/bin.sun3
 INSTALL = cp
 
 #
@@ -34,12 +34,11 @@ COMPAT = malloc.o
 #
 # Device drivers for rview (see also devtable.c):
 #
-DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
-	colortab.o nwsdev.o
-DSRC = devtable.c devcomm.c aed.c tty.c editline.c x10.c xtwind.c \
-	colortab.c nwsdev.c
-DLIBS = -lX -lcps
-DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
+DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
+	colortab.o
+DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
+	colortab.c
+DLIBS = -lX11
 
 #
 # Standard object files:
@@ -90,13 +89,19 @@ MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS) $(DRIVERS)
+all:	$(PROGS)
 
-install:	all
+install:	$(PROGS)
 	$(INSTALL) $(PROGS) $(INSTDIR)
 
+sun:	$(DEVDIR)/sun $(DEVDIR)/sun.com
+
+x10:	$(DEVDIR)/x10
+
+aed:	$(DEVDIR)/aed
+
 clean:
-	rm -f *.o core
+	rm -f $(PROGS) *.o core
 
 lint:	$(RVSRC)
 	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
@@ -124,10 +129,14 @@ editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
 $(DEVDIR)/sun.com:	suncom.o editline.o
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
 
-$(DEVDIR)/x11:	x11.o x11twind.o colortab.o devmain.o editline.o
-	$(CC) $(CFLAGS) -s -o $(DEVDIR)/x11 x11.o x11twind.o devmain.o \
-colortab.o editline.o -lX11 $(LIBS)
+$(DEVDIR)/x10:	x10.o xtwind.o colortab.o devmain.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
+colortab.o editline.o -lX $(LIBS)
 
+$(DEVDIR)/aed:	aed.o colortab.o tty.o devmain.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
+devmain.o tty.o editline.o $(LIBS)
+
 #
 # Special compiles:
 #
@@ -158,9 +167,12 @@ devcomm.o:	devcomm.c
 sundev.o:	sundev.c
 	$(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
 
-x11.o:	x11.c
-	$(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
+x10.o:	x10.c
+	$(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
 
+aed.o:	aed.c
+	$(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
+
 ambient.o:	ambient.c
 	$(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
 
@@ -218,15 +230,17 @@ ambient.o rpict.o rv3.o source.o:	random.h
 ambient.o dielectric.o func.o glass.o m_clip.o \
 m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
 p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
-rtrace.o rv2.o rv3.o source.o \
-sphere.o t_data.o t_func.o:	ray.h standard.h fvect.h object.h color.h
+rtrace.o rv2.o rv3.o source.o sphere.o \
+t_data.o t_func.o:	ray.h standard.h mat4.h fvect.h object.h color.h
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h view.h
 
 source.o:	source.h
 
-cone.o data.o devcomm.o face.o image.o initotypes.o misc.o objset.o \
-octree.o otypes.o readobj.o readoct.o rview.o:	standard.h fvect.h
+cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
+octree.o otypes.o readobj.o readoct.o rview.o:	standard.h mat4.h fvect.h
+
+mat4.o:		mat4.h fvect.h
 
 sundev.o:	suntools.icon