--- ray/src/rt/Rmakefile	1990/12/12 22:36:51	1.35
+++ ray/src/rt/Rmakefile	1991/03/07 15:12:09	1.39
@@ -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:
@@ -59,8 +58,8 @@ ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
 	$(MODSRC) $(SUPPSRC) $(MISCSRC)
 
-OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o
-OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c
+OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
+OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
 
 RAYOBJS = raytrace.o ambient.o
 RAYSRC = raytrace.c ambient.c
@@ -90,13 +89,20 @@ 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:
+	@echo
+
 clean:
-	rm -f *.o core
+	rm -f $(PROGS) *.o core
 
 lint:	$(RVSRC)
 	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
@@ -124,9 +130,9 @@ 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)
 
 #
 # Special compiles:
@@ -158,8 +164,8 @@ 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
 
 ambient.o:	ambient.c
 	$(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
@@ -193,7 +199,7 @@ devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x1
 
 cone.o o_cone.o source.o:	cone.h
 
-data.o mx_data.o p_data.o t_data.o:	data.h
+data.o m_brdf.o mx_data.o p_data.o t_data.o:	data.h
 
 aed.o devcomm.o devmain.o devtable.o \
 editline.o nwsdev.o sundev.o tty.o x10.o x11.o:	driver.h
@@ -209,24 +215,26 @@ rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source
 
 o_instance.o instance.o:	instance.h octree.h
 
-ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
-otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
+ambient.o cone.o dielectric.o func.o initotypes.o m_brdf.o normal.o o_cone.o \
+objset.o otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
 rv2.o source.o sphere.o:	otypes.h
 
 ambient.o rpict.o rv3.o source.o:	random.h
 
 ambient.o dielectric.o func.o glass.o m_clip.o \
-mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.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 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