--- ray/src/rt/Rmakefile	1991/07/16 10:39:25	1.53
+++ ray/src/rt/Rmakefile	1991/08/16 12:54:48	1.57
@@ -1,6 +1,5 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 #  Compiles for ray tracing programs.
 #
 
@@ -65,14 +64,16 @@ SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_fa
 SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
 		o_cone.c o_instance.c
 
-MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
-MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c
+MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
+	m_direct.o
+MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
+	m_direct.c
 
 MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
 MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
 
-SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o
-SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
+SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c
 
 #
 # What this makefile produces:
@@ -91,6 +92,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+tiff:	
+
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
 
@@ -101,13 +104,13 @@ lint:	$(RVSRC)
 # Links:
 #
 
-$(DESTDIR)/rtrace:	$(RTOBJS)
+$(DESTDIR)/rtrace:	$(RTOBJS) ../common/librt.a
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
 
-$(DESTDIR)/rpict:	$(RPOBJS)
+$(DESTDIR)/rpict:	$(RPOBJS) ../common/librt.a
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
 
-$(DESTDIR)/rview:	$(RVOBJS)
+$(DESTDIR)/rview:	$(RVOBJS) ../common/librt.a
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o
@@ -144,12 +147,15 @@ rvmain.o:	rmain.c
 	$(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
 	mv rmain.o rvmain.o
 
+readfargs.o:	readfargs.c ../common/object.h
+	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
+
 #
 # Uncomment the following to model dispersion:
 #
-#dielectric.o:	dielectric.c source.h
-#	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
-#
+dielectric.o:	dielectric.c source.h
+	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
+
 # end of dispersion compiles.
 
 devcomm.o:	devcomm.c
@@ -186,7 +192,7 @@ nwsdev.h:	nwsdev.cps newsconstants.h
 aed.o colortab.o data.o devcomm.o \
 devmain.o lookamb.o rview.o sundev.o x10.o x11.o:	../common/color.h
 
-o_cone.o srcsupp.o:	cone.h
+o_cone.o srcsupp.o:	../common/cone.h
 
 data.o m_brdf.o mx_data.o p_data.o t_data.o:	data.h