--- ray/src/util/Rmakefile	2011/06/09 13:17:28	2.60
+++ ray/src/util/Rmakefile	2013/12/04 20:07:07	2.63
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.60 2011/06/09 13:17:28 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 rttree_reduce
+		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
@@ -110,6 +110,9 @@ dctimestep:	dctimestep.o
 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 \
@@ -179,6 +182,8 @@ rsensor.o:	../rt/ray.h ../common/octree.h \
 ../common/rterror.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 .