--- ray/src/util/Rmakefile	2012/06/14 22:42:21	2.61
+++ ray/src/util/Rmakefile	2014/01/20 21:29:04	2.64
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.61 2012/06/14 22:42:21 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.64 2014/01/20 21:29:04 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 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
@@ -104,12 +104,16 @@ glrad:	glrad.o
 	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
 -lX11 -lXext $(MLIB)
 
-dctimestep:	dctimestep.o
-	$(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
+dctimestep:	dctimestep.o cmbsdf.o cmatrix.o
+	$(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.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 \
@@ -125,9 +129,19 @@ 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/paths.h \
-../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
+../common/rterror.h ../common/resolu.h
 
+dctimestep.o cmatrix.o cmbsdf.o:	cmatrix.h ../common/color.h
+
+cmatrix.o cmbsdf.o:	../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
+
+cmbsdf.o:	../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
+
+dctimestep.o cmatrix.o:	../common/platform.h
+
 rtcontrib.o:	../common/platform.h ../common/rtprocess.h \
 ../common/color.h ../common/resolu.h ../common/lookup.h \
 ../common/calcomp.h ../common/selcall.h
@@ -179,6 +193,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 .