--- ray/src/rt/Rmakefile	1993/02/12 10:38:36	2.13
+++ ray/src/rt/Rmakefile	1994/04/22 11:45:22	2.17
@@ -8,6 +8,7 @@ MACH = -DBSD
 CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 SPECIAL = aed
 CC = cc
+MLIB = -lm
 LINT = lint
 LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
 -DINCHAN -DRCONST -DREDEFW
@@ -28,7 +29,7 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = -lrt -lm
+LIBS = -lrt $(MLIB)
 
 #
 # Device drivers for rview (see also devtable.c):
@@ -66,17 +67,17 @@ SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_fac
 		srcsamp.c o_cone.c o_instance.c
 
 MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
-	m_mirror.o m_direct.o
+	m_mirror.o m_direct.o fprism.o
 MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
-	m_mirror.c m_direct.c
+	m_mirror.c m_direct.c fprism.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 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
 
@@ -149,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
@@ -246,7 +247,7 @@ rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.
 m_direct.o m_mirror.o \
 source.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
-cone.o data.o devcomm.o freeobjmem.o initotypes.o \
+cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o \
 octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
 initotypes.o raytrace.o:	otspecial.h