--- ray/src/util/Rmakefile	2009/06/16 04:54:08	2.52
+++ ray/src/util/Rmakefile	2014/02/09 05:49:21	2.66
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.52 2009/06/16 04:54:08 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.66 2014/02/09 05:49:21 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -20,17 +20,18 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc rtcontrib rsensor
+		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
+		eplus_adduvf
 
 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 gentregvec.pl tregsamp.dat
+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
@@ -41,10 +42,12 @@ genambpos.csh fieldcomb.csh genklemsamp.pl gentregvec.
 	cp genambpos.csh $(INSTDIR)/genambpos
 	cp fieldcomb.csh $(INSTDIR)/fieldcomb
 	cp genklemsamp.pl $(INSTDIR)/genklemsamp
-	cp gentregvec.pl $(INSTDIR)/gentregvec
+	cp genskyvec.pl $(INSTDIR)/genskyvec
+	cp genBSDF.pl $(INSTDIR)/genBSDF
 	cd $(INSTDIR) ; chmod 755 objview objpict \
 		glare dayfact debugcal rlux raddepend objline \
-		compamb vinfo genambpos fieldcomb genklemsamp gentregvec
+		compamb vinfo genambpos fieldcomb genklemsamp \
+		genskyvec genBSDF
 	cp tregsamp.dat $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
@@ -102,8 +105,26 @@ glrad:	glrad.o
 	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
 -lX11 -lXext $(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
+
+eplus_adduvf:	eplus_adduvf.o eplus_idf.o
+	$(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o -lrtrad
+
 setscan.o:	setscan.h
 
+eplus_adduvf.o:	../common/triangulate.h
+
+eplus_adduvf.o eplus_idf.o:	eplus_idf.h \
+../common/lookup.h
+
 findglare.o glareval.o \
 glaresrc.o:	glare.h ../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
@@ -114,6 +135,22 @@ glaresrc.o:	../common/linregr.h
 
 rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
+dctimestep.o:	../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.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
@@ -127,6 +164,8 @@ xglaresrc.o:	../common/view.h
 
 glareval.o xglaresrc.o:	../common/resolu.h
 
+glareval.o:	../common/platform.h ../common/rtprocess.h
+
 rad.o ranimate.o:	../common/vars.h
 
 ranimove1.o ranimove2.o vwrays.o:	../common/random.h
@@ -164,8 +203,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