--- ray/src/util/Rmakefile	2014/02/09 05:49:21	2.66
+++ ray/src/util/Rmakefile	2014/04/26 15:59:38	2.73
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.66 2014/02/09 05:49:21 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.73 2014/04/26 15:59:38 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -23,11 +23,14 @@ PROGS = findglare glarendx rpiece rad ranimate ranimov
 		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
 		eplus_adduvf
 
+LIBFILES = rambpos.cal ambpos.cal tregsamp.dat
+
 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.pl fieldcomb.csh genklemsamp.pl \
+genskyvec.pl genBSDF.pl $(LIBFILES)
 	cp $(PROGS) $(INSTDIR)
 	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -39,20 +42,23 @@ genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
 	cp raddepend.csh $(INSTDIR)/raddepend
 	cp compamb.csh $(INSTDIR)/compamb
 	cp vinfo.csh $(INSTDIR)/vinfo
-	cp genambpos.csh $(INSTDIR)/genambpos
+	cp genambpos.pl $(INSTDIR)/genambpos
 	cp fieldcomb.csh $(INSTDIR)/fieldcomb
 	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 \
 		genskyvec genBSDF
-	cp tregsamp.dat $(LIBDIR)
+	cd $(LIBDIR) && rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
+	set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
 
 ogl:	glrad
 	cp glrad $(INSTDIR)
@@ -89,9 +95,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)
 
@@ -116,11 +119,14 @@ 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
+	$(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
+-lrtrad $(MLIB)
 
 setscan.o:	setscan.h
 
-eplus_adduvf.o:	../common/triangulate.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
@@ -151,11 +157,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