--- ray/src/rt/Rmakefile	1990/06/28 13:58:31	1.26
+++ ray/src/rt/Rmakefile	1990/09/22 10:52:19	1.31
@@ -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
 
 #
@@ -62,8 +62,8 @@ MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o m
 
 SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
 
-MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
-		fgetline.o ealloc.o
+MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
+		color.o resolu.o
 
 #
 # What this makefile produces:
@@ -123,14 +123,11 @@ rvmain.o:	rmain.c
 	mv rmain.o rvmain.o
 
 #
-# Uncomment the following to model dispersion:
+# Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
 #
 #dielectric.o:	dielectric.c source.h
 #	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
 #
-#color.o:	color.c color.h
-#	$(CC) $(CFLAGS) -DSPEC_RGB -c color.c
-#
 # end of dispersion compiles.
 
 sundev.o:	sundev.c
@@ -154,21 +151,27 @@ 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:
 #
 
 caldefn.o calexpr.o calfunc.o:	calcomp.h
 
-aed.o color.o colortab.o data.o devcomm.o \
-devmain.o lookamb.o rview.o sundev.o x10.o x11.o:	color.h
+aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
+devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:	color.h
 
 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 +179,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