--- ray/src/rt/Rmakefile	2004/11/05 03:31:38	2.49
+++ ray/src/rt/Rmakefile	2010/09/26 15:51:15	2.61
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.49 2004/11/05 03:31:38 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.61 2010/09/26 15:51:15 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -30,7 +30,7 @@ LIBDIR = /usr/local/lib/ray
 #
 RLIB = ../lib/libradiance.a
 RCLIB = ../lib/libraycalls.a
-LIBS = -lrt $(MLIB)
+LIBS = -lrtrad $(MLIB)
 
 #
 # Device drivers for rvu (see also devtable.c):
@@ -54,8 +54,8 @@ RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
 RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
 RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
 
-RLOBJS = raycalls.o raypcalls.o
-RLSRC = raycalls.c raypcalls.c
+RLOBJS = raycalls.o raypcalls.o rayfifo.o
+RLSRC = raycalls.c raypcalls.c rayfifo.c
 
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS)
@@ -111,40 +111,30 @@ lint:	$(RVSRC)
 # Links:
 #
 
-$(DESTDIR)/rtrace:	$(RTOBJS) $(RLIB)
-	$(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
+$(DESTDIR)/rtrace:	$(RTOBJS) $(RCLIB) $(RLIB)
+	$(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
 
 $(DESTDIR)/rpict:	$(RPOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
 
-$(DESTDIR)/rvu:	$(RVOBJS) $(RLIB)
-	$(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
+$(DESTDIR)/rvu:	$(RVOBJS) $(RCLIB) $(RLIB)
+	$(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
+$(RLIB) $(LIBS) $(DLIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
 $(RLIB):	$(ROBJS) Version.o
+	rm -f $(RLIB)
 	ar rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
 $(RCLIB):	$(RLOBJS)
+	rm -f $(RCLIB)
 	ar rc $(RCLIB) $(RLOBJS)
 	-ranlib $(RCLIB)
 
 #
-# Special compiles:
-#
-
-rtmain.o:	rtmain.c
-	$(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
-
-rpmain.o:	rpmain.c
-	$(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
-
-rvmain.o:	rvmain.c
-	$(CC) $(CFLAGS) -c rvmain.c
-
-#
 # Uncomment the following to model dispersion:
 #
 dielectric.o:	dielectric.c source.h
@@ -190,29 +180,29 @@ m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o prelo
 raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
 srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
 
-ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
-rtmain.o rpmain.o persist.o source.o rv3.o \
+ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
+rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
 srcsamp.o virtuals.o:	../common/random.h
 
 ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
 m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
 mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
-raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
+raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
 source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
 text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:	ray.h \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
-../common/rterror.h ../common/octree.h ../common/tifftypes.h \
+../common/rterror.h ../common/octree.h \
 ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h ../common/resolu.h
 
 m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
-rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
+rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
 srcobstr.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
 cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
 duphead.o octree.o:	../common/standard.h ../common/rtmisc.h \
-../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \
+../common/rtio.h ../common/rtmath.h \
 ../common/rterror.h ../common/mat4.h ../common/fvect.h
 
 ambio.o:	../common/fvect.h
@@ -247,3 +237,9 @@ raypcalls.o:	../common/selcall.h
 o_mesh.o:	../common/mesh.h
 
 noise3.o:	../common/calcomp.h
+
+aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
+m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
+mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
+o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
+srcobstr.o text.o:		rtotypes.h