--- ray/src/util/Rmakefile	2014/02/01 01:28:43	2.65
+++ ray/src/util/Rmakefile	2014/04/15 22:36:25	2.71
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.65 2014/02/01 01:28:43 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.71 2014/04/15 22:36:25 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -20,13 +20,15 @@ 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.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
+ltview.pl ltpict.pl genambpos.csh fieldcomb.csh genklemsamp.pl \
+genskyvec.pl genBSDF.pl tregsamp.dat
 	cp $(PROGS) $(INSTDIR)
 	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -43,6 +45,8 @@ genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
 	cp genklemsamp.pl $(INSTDIR)/genklemsamp
 	cp genskyvec.pl $(INSTDIR)/genskyvec
 	cp genBSDF.pl $(INSTDIR)/genBSDF
+	cp ltview.pl $(INSTDIR)/ltview
+	cp ltpict.pl $(INSTDIR)/ltpict
 	cd $(INSTDIR) ; chmod 755 objview objpict \
 		glare dayfact debugcal rlux raddepend objline \
 		compamb vinfo genambpos fieldcomb genklemsamp \
@@ -88,9 +92,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)
 
@@ -114,9 +115,17 @@ 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_idf.o:	eplus_idf.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 \
@@ -145,11 +154,7 @@ cmbsdf.o:	../common/paths.h ../common/bsdf.h ../common
 
 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
-
-rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:	../common/standard.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