--- ray/src/util/Rmakefile	2013/09/05 17:53:23	2.62
+++ ray/src/util/Rmakefile	2014/04/08 23:46:05	2.70
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.62 2013/09/05 17:53:23 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.70 2014/04/08 23:46:05 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 rsensor dctimestep rttree_reduce rcollate
+		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 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
@@ -88,9 +89,6 @@ rsensor:	rsensor.o
 rpiece:	rpiece.o Version.o
 	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
 
-rtcontrib:	rtcontrib.o Version.o
-	$(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
-
 vwright:	vwright.o
 	$(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
 
@@ -104,8 +102,9 @@ 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)
@@ -113,8 +112,19 @@ rttree_reduce:	rttree_reduce.o
 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 $(MLIB)
+
 setscan.o:	setscan.h
 
+eplus_adduvf.o:	../common/triangulate.h ../common/rtprocess.h \
+../common/paths.h ../common/rtio.h ../common/random.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.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 \
@@ -128,14 +138,20 @@ 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
 
-rtcontrib.o:	../common/platform.h ../common/rtprocess.h \
-../common/color.h ../common/resolu.h ../common/lookup.h \
-../common/calcomp.h ../common/selcall.h
+dctimestep.o cmatrix.o cmbsdf.o:	cmatrix.h ../common/color.h
 
-rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:	../common/standard.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
+
+rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
 ../common/rterror.h