--- ray/src/rt/Rmakefile	1993/12/09 17:31:10	2.15
+++ ray/src/rt/Rmakefile	1995/09/29 11:27:00	2.18
@@ -74,10 +74,10 @@ MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
 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 readfargs.o \
-	malloc.o
-SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
-	malloc.c
+SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \
+	readfargs.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
+	readfargs.c
 
 HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
@@ -150,15 +150,15 @@ $(DEVDIR)/news: nwsdev.o devmain.o editline.o
 #
 
 rtmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c
 	mv rmain.o rtmain.o
 
 rpmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c
 	mv rmain.o rpmain.o
 
 rvmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRVIEW -c rmain.c
 	mv rmain.o rvmain.o
 
 readfargs.o:	readfargs.c ../common/object.h
@@ -228,9 +228,10 @@ rtrace.o rvmain.o rv2.o rv3.o source.o:	../common/octr
 
 o_instance.o:	../common/instance.h ../common/octree.h
 
-ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \
-normal.o o_cone.o text.o raytrace.o rtrace.o freeobjmem.o \
-rv2.o source.o srcsupp.o virtuals.o sphere.o:	../common/otypes.h
+ambient.c aniso.c dielectric.c freeobjmem.c func.c initotypes.c \
+m_brdf.c m_direct.c m_mirror.c normal.c o_cone.c preload.c \
+raytrace.c rtrace.c rv2.c source.c sphere.c srcsupp.c text.c \
+virtuals.c:	../common/otypes.h
 
 ambient.o ambcomp.o aniso.o normal.o rpict.o \
 rv3.o srcsamp.o virtuals.o:	../common/random.h