--- ray/src/rt/Rmakefile	1990/06/28 13:58:31	1.26
+++ ray/src/rt/Rmakefile	1990/09/17 18:02:19	1.30
@@ -4,7 +4,7 @@
 #  Compiles for ray tracing programs.
 #
 
-OPT = -O
+OPT = -O -pipe
 MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
 CFLAGS = $(MACH) $(OPT)
 CC = cc
@@ -26,14 +26,14 @@ LIBDIR = /usr/local/lib/ray
 # Library routines:
 #
 LIBS = -lm
-COMPAT = malloc.o
+COMPAT =
 
 #
 # 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
-DLIBS = -lX
+	colortab.o nwsdev.o
+DLIBS = -lX -lcps
 DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
 
 #
@@ -154,6 +154,12 @@ calfunc.o:	calfunc.c calcomp.h
 xf.o:	xf.c
 	$(CC) $(CFLAGS) -DINVXF -c xf.c
 
+nwsdev.o:	nwsdev.c nwsdev.h newsconstants.h
+	$(CC) $(CFLAGS) -c nwsdev.c
+
+nwsdev.h:	nwsdev.cps newsconstants.h
+	cps nwsdev.cps
+
 #
 # Include dependencies:
 #
@@ -168,7 +174,7 @@ cone.o o_cone.o source.o:	cone.h
 data.o mx_data.o p_data.o t_data.o:	data.h
 
 aed.o devcomm.o devmain.o devtable.o \
-editline.o sundev.o tty.o x10.o x11.o:	driver.h
+editline.o nwsdev.o sundev.o tty.o x10.o x11.o:	driver.h
 
 face.o o_face.o source.o:	face.h
 
@@ -176,13 +182,13 @@ fvect.o:	fvect.h
 
 cone.o face.o objset.o otypes.o readobj.o readoct.o:	object.h
 
-ambient.o objset.o octree.o raytrace.o \
-readoct.o rpmain.o rtmain.o rvmain.o rv2.o rv3.o source.o:	octree.h
+ambient.o objset.o octree.o raytrace.o readoct.o \
+rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:	octree.h
 
 o_instance.o instance.o:	instance.h octree.h
 
-ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
-text.o raytrace.o readobj.o readoct.o rtrace.o \
+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 \
 rv2.o source.o sphere.o:	otypes.h
 
 ambient.o rpict.o rv3.o source.o:	random.h