--- ray/src/rt/Rmakefile	2011/02/18 00:40:25	2.62
+++ ray/src/rt/Rmakefile	2012/06/14 22:42:21	2.65
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.62 2011/02/18 00:40:25 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.65 2012/06/14 22:42:21 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -54,6 +54,9 @@ 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)
 
+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
 
@@ -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)
 
@@ -121,6 +126,9 @@ $(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)
 
@@ -224,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
@@ -245,4 +254,4 @@ o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o 
 srcobstr.o text.o:		rtotypes.h
 
 m_bsdf.o:	ambient.h source.h func.h \
-../common/calcomp.h ../common/paths.h ../common/bsdf.h ../common/random.h
+../common/calcomp.h ../common/bsdf.h ../common/random.h