--- ray/src/util/Rmakefile	2003/05/14 21:40:40	2.32
+++ ray/src/util/Rmakefile	2017/08/11 21:39:52	2.83
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.32 2003/05/14 21:40:40 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.83 2017/08/11 21:39:52 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -9,6 +9,8 @@ OPT = -O
 
 CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 
+MLIB = -lm
+
 CC = cc
 
 SPECIAL =
@@ -18,16 +20,23 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc
+		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
+		eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare
 
+LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
+klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \
+minimalBSDFt.xml WINDOW6BSDFt.xml
+
 all:	$(PROGS)
 
-install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
-rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
+install:	all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
+rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
+ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \
+genskyvec.pl genBSDF.pl bsdfview.pl $(LIBFILES)
 	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
@@ -35,107 +44,153 @@ rlux.csh raddepend.csh trad.wsh objline.csh compamb.cs
 	cp raddepend.csh $(INSTDIR)/raddepend
 	cp compamb.csh $(INSTDIR)/compamb
 	cp vinfo.csh $(INSTDIR)/vinfo
-	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
-		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
-		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
-		$(INSTDIR)/compamb $(INSTDIR)/vinfo
+	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 bsdfview.pl $(INSTDIR)/bsdfview
+	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
+	cd $(LIBDIR) && rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) glrad core
+	set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
 
 ogl:	glrad
 	cp glrad $(INSTDIR)
 
-x10:
-
-aed:
-
 sgi:
 
 sun:
 
-scanner:	scanner.o
-	$(CC) $(CFLAGS) -o scanner scanner.o -lm
-
-makedist:	makedist.o setscan.o
-	$(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
-
 findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-setscan.o -lrt -lm
+setscan.o -lrtrad $(MLIB)
 
 glarendx:	glarendx.o
-	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB)
 
 xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
-x11findwind.o -lrt -lX11 -lm
+x11findwind.o -lrtrad -lX11 $(MLIB)
 
 rad:	rad.o
-	$(CC) $(CFLAGS) -o rad rad.o -lrt -lm
+	$(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB)
 
 ranimate:	ranimate.o netproc.o
-	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
+	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad $(MLIB)
 
-ranimove:	ranimove.o ranimove1.o ranimove2.o \
-../lib/raypcalls.o ../lib/raycalls.o
+ranimove:	ranimove.o ranimove1.o ranimove2.o
 	$(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \
--lraypcalls.o -lraycalls.o -lradiance -lrt -lm
+-lraycalls -lradiance -lrtrad $(MLIB)
 
+rsensor:	rsensor.o
+	$(CC) $(CFLAGS) -o rsensor rsensor.o \
+-lraycalls -lradiance -lrtrad $(MLIB)
+
 rpiece:	rpiece.o Version.o
-	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
+	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
 
 vwright:	vwright.o
-	$(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
+	$(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
 
 vwrays:		vwrays.o
-	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
+	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
 
 getinfo:	getinfo.o
-	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
+	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
 
 glrad:	glrad.o
-	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
--lX11 -lXext -lm
+	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
+-lX11 -lXext $(MLIB)
 
-contour:	contour.o
-	$(CC) $(CFLAGS) -o contour contour.o -lm
+dctimestep:	dctimestep.o cmbsdf.o cmatrix.o
+	$(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
+-lrtrad $(MLIB)
 
-pranim:	pranim.o client/libclient.a
-	$(CC) $(CFLAGS) -o pranim pranim.o \
-client/libclient.a -lrpcsvc
+rttree_reduce:	rttree_reduce.o
+	$(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
 
-t16anim:	t16anim.o client/libclient.a
-	$(CC) $(CFLAGS) -o t16anim t16anim.o \
-client/libclient.a -lrpcsvc
+rcollate:	rcollate.o
+	$(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
 
-t16anim.o pranim.o:	client/clnt.h
+eplus_adduvf:	eplus_adduvf.o eplus_idf.o
+	$(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
+-lrtrad $(MLIB)
 
-setscan.o makedist.o:	setscan.h
+rfluxmtx:	rfluxmtx.o
+	$(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB)
 
+rmtxop:	rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
+	$(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
+-lrtrad $(MLIB)
+
+wrapBSDF:	wrapBSDF.o
+	$(CC) $(CFLAGS) -o wrapBSDF wrapBSDF.o -lrtrad $(MLIB)
+
+evalglare:	evalglare.o pictool.o
+	$(CC) $(CFLAGS) -o evalglare evalglare.o pictool.o -lreetz -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/mat4.h \
-../common/fvect.h ../common/view.h ../common/color.h setscan.h
+glaresrc.o:	glare.h ../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/view.h ../common/color.h setscan.h
 
 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
+
+rfluxmtx.o:	../common/rtio.h ../common/random.h ../common/triangulate.h \
+../common/rtmath.h ../common/fvect.h ../common/mat4.h ../common/tiff.h \
+../common/platform.h ../common/bsdf.h ../common/bsdf_m.h ../common/rtprocess.h
+
+rmtxop.o dctimestep.o cmatrix.o:	../common/platform.h
+
 rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
-../common/mat4.h ../common/fvect.h
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 xglaresrc.o:	../common/view.h
 
-swaprasheader.o:	../common/rasterfile.h
-
 glareval.o xglaresrc.o:	../common/resolu.h
 
-xglaresrc.o:	../common/vfork.h
+glareval.o:	../common/platform.h ../common/rtprocess.h
 
 rad.o ranimate.o:	../common/vars.h
 
-ranimove1.o ranimove2.o:	../common/random.h
+ranimove1.o ranimove2.o vwrays.o:	../common/random.h
 
 rad.o:	../common/paths.h
 
@@ -148,18 +203,48 @@ netproc.o:	../common/paths.h
 rad.o ranimate.o ranimove.o:	../common/view.h ../common/resolu.h
 
 glrad.o:	../common/radogl.h \
-../common/standard.h ../common/mat4.h ../common/fvect.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h ../common/rterror.h \
 ../common/color.h ../common/object.h ../common/otypes.h ../common/lookup.h
 
 glrad.o:	glradicon.h ../common/view.h ../common/paths.h
 
 ranimove.o ranimove1.o ranimove2.o:	ranimove.h \
 ../common/vars.h ../common/view.h \
-../rt/ray.h ../common/standard.h ../common/octree.h \
-../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
+../rt/ray.h ../common/octree.h \
+../common/object.h ../common/color.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
+rsensor.o:	../rt/ray.h ../common/octree.h \
+../common/object.h ../common/color.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.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
+
+rmatrix.o:	rmatrix.h cmatrix.h ../common/resolu.h
+
+rmtxop.o:	rmatrix.h cmatrix.h ../common/rtio.h ../common/resolu.h
+
+wrapBSDF.o:	../common/rtio.h ../common/rtprocess.h ../common/ezxml.h \
+../common/bsdf.h ../common/bsdf_m.h ../common/fvect.h ../common/ccolor.h
+
+pictool.o evalglare.o:	pictool.h ../common/g3vector.h ../common/g3affine.h \
+../common/g3flist.h ../common/fvect.h ../common/gbasic.h
+
+evalglare.o:	../common/rtio.h
+
+pictool.o:	../common/view.h ../common/color.h