--- ray/src/util/Rmakefile	2009/07/02 02:13:07	2.55
+++ ray/src/util/Rmakefile	2012/06/14 22:42:21	2.61
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.55 2009/07/02 02:13:07 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.61 2012/06/14 22:42:21 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -20,13 +20,13 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc rtcontrib rsensor dctimestep
+		vwrays xglaresrc rsensor dctimestep rttree_reduce
 
 all:	$(PROGS)
 
 install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
 rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
-genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl tregsamp.dat
+genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -42,9 +42,11 @@ genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
 	cp fieldcomb.csh $(INSTDIR)/fieldcomb
 	cp genklemsamp.pl $(INSTDIR)/genklemsamp
 	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 genskyvec
+		compamb vinfo genambpos fieldcomb genklemsamp \
+		genskyvec genBSDF
 	cp tregsamp.dat $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
@@ -105,6 +107,9 @@ glrad:	glrad.o
 dctimestep:	dctimestep.o
 	$(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
 
+rttree_reduce:	rttree_reduce.o
+	$(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
+
 setscan.o:	setscan.h
 
 findglare.o glareval.o \
@@ -120,8 +125,8 @@ 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/color.h ../common/bsdf.h ../common/resolu.h
+../common/rterror.h ../common/platform.h ../common/paths.h \
+../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
 
 rtcontrib.o:	../common/platform.h ../common/rtprocess.h \
 ../common/color.h ../common/resolu.h ../common/lookup.h \
@@ -136,6 +141,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
@@ -178,3 +185,5 @@ Version.c:	../rt/Version.c
 
 x11findwind.c:	../common/x11findwind.c
 	cp ../common/x11findwind.c .
+
+rttree_reduce.o:	../common/rtio.h ../common/rterror.h