--- ray/src/rt/Rmakefile	1990/09/06 23:31:23	1.29
+++ ray/src/rt/Rmakefile	1990/12/12 22:03:32	1.34
@@ -19,7 +19,7 @@ INSTALL = cp
 #
 # The following paths must exist and be relative to root:
 #
-DEVDIR = $(INSTDIR)
+DEVDIR = $(INSTDIR)/dev
 LIBDIR = /usr/local/lib/ray
 
 #
@@ -34,7 +34,7 @@ COMPAT = malloc.o
 DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
 	colortab.o nwsdev.o
 DLIBS = -lX -lcps
-DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
+DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
 
 #
 # Standard object files:
@@ -56,14 +56,14 @@ RAYOBJS = raytrace.o ambient.o
 SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
 		o_cone.o o_instance.o instance.o
 
-MATOBJS = normal.o dielectric.o m_clip.o glass.o
+MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
 
 MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
 
 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:
@@ -95,15 +95,15 @@ $(DESTDIR)/rview:	$(RVOBJS)
 $(DESTDIR)/lookamb:	lookamb.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
 
-$(DEVDIR)/sundev:	sundev.o devmain.o colortab.o editline.o
-	$(CC) $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
+$(DEVDIR)/sun:	sundev.o devmain.o colortab.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
 editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
 
 $(DEVDIR)/sun.com:	suncom.o editline.o
-	$(CC) $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
 
-$(DEVDIR)/x11dev:	x11.o x11twind.o colortab.o devmain.o editline.o
-	$(CC) $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.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)
 
 #
@@ -123,18 +123,18 @@ 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.
 
+devcomm.o:	devcomm.c
+	$(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
+
 sundev.o:	sundev.c
-	$(CC) $(CFLAGS) -Dsun_init=dinit -c 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
@@ -166,8 +166,8 @@ nwsdev.h:	nwsdev.cps newsconstants.h
 
 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