--- ray/src/rt/Rmakefile	2008/08/21 07:05:58	2.57
+++ ray/src/rt/Rmakefile	2012/06/14 22:42:21	2.65
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.57 2008/08/21 07:05:58 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.65 2012/06/14 22:42:21 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -54,9 +54,12 @@ 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
+RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
+RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
 
+RLOBJS = raycalls.o raypcalls.o rayfifo.o
+RLSRC = raycalls.c raypcalls.c rayfifo.c
+
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS)
 RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
@@ -73,9 +76,9 @@ SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
 	o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
 
 MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
-	m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
+	m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o
 MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
-	m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
+	m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.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
@@ -89,13 +92,15 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 # What this makefile produces:
 #
 
-PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
+PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
+$(DESTDIR)/lookamb
 
 all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
 	cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
+	cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -111,8 +116,8 @@ 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)
@@ -121,14 +126,19 @@ $(DESTDIR)/rvu:	$(RVOBJS) $(RCLIB) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
 $(RLIB) $(LIBS) $(DLIBS)
 
+$(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
+	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
+
 $(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)
 
@@ -182,10 +192,10 @@ ambient.o ambcomp.o aniso.o normal.o raycalls.o raytra
 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 \
+ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.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 \
@@ -222,8 +232,9 @@ rv2.o:	../common/resolu.h
 aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
 p_func.o t_data.o t_func.o:	func.h ../common/calcomp.h
 
-preload.o:	../common/object.h ../common/face.h ../common/cone.h \
-../common/instance.h ../common/mesh.h ../common/color.h data.h
+preload.o:	data.h func.h ../common/object.h ../common/face.h \
+../common/cone.h ../common/instance.h ../common/mesh.h \
+../common/color.h ../common/bsdf.h ../common/otypes.h
 
 rtmain.o rpmain.o rvmain.o persist.o duphead.o \
 renderopts.o rpict.o:	../common/paths.h
@@ -241,3 +252,6 @@ m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mi
 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
+
+m_bsdf.o:	ambient.h source.h func.h \
+../common/calcomp.h ../common/bsdf.h ../common/random.h