--- ray/src/util/Rmakefile	2010/12/02 18:08:11	2.57
+++ ray/src/util/Rmakefile	2013/12/04 20:07:07	2.63
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.57 2010/12/02 18:08:11 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.63 2013/12/04 20:07:07 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -20,17 +20,17 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc rtcontrib rsensor dctimestep
+		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate
 
 all:	$(PROGS)
 
-install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
+install:	all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
 rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
 genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
 	cp $(PROGS) $(INSTDIR)
-	cp objview.csh $(INSTDIR)/objview
+	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
-	cp objpict.csh $(INSTDIR)/objpict
+	cp objpict.pl $(INSTDIR)/objpict
 	cp glare.csh $(INSTDIR)/glare
 	cp dayfact.csh $(INSTDIR)/dayfact
 	cp debugcal.csh $(INSTDIR)/debugcal
@@ -107,6 +107,12 @@ glrad:	glrad.o
 dctimestep:	dctimestep.o
 	$(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
 
+rttree_reduce:	rttree_reduce.o
+	$(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
+
+rcollate:	rcollate.o
+	$(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
+
 setscan.o:	setscan.h
 
 findglare.o glareval.o \
@@ -122,8 +128,8 @@ rpiece.o:	../common/color.h ../common/view.h ../common
 dctimestep.o:	../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.h ../common/platform.h \
-../common/color.h ../common/bsdf.h ../common/resolu.h
+../common/rterror.h ../common/platform.h ../common/paths.h \
+../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
 
 rtcontrib.o:	../common/platform.h ../common/rtprocess.h \
 ../common/color.h ../common/resolu.h ../common/lookup.h \
@@ -177,8 +183,12 @@ rsensor.o:	../rt/ray.h ../common/octree.h \
 
 rsensor.o:	../common/view.h ../common/resolu.h ../rt/source.h
 
+rcollate.o:	../common/platform.h ../common/rtio.h ../common/resolu.h
+
 Version.c:	../rt/Version.c
 	cp ../rt/Version.c .
 
 x11findwind.c:	../common/x11findwind.c
 	cp ../common/x11findwind.c .
+
+rttree_reduce.o:	../common/rtio.h ../common/rterror.h