--- ray/src/util/Rmakefile	2023/02/09 00:18:05	2.102
+++ ray/src/util/Rmakefile	2025/04/19 17:12:59	2.110
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.102 2023/02/09 00:18:05 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.110 2025/04/19 17:12:59 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -24,11 +24,11 @@ LIBDIR = /usr/local/lib/ray
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
 		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
 		eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare radcompare \
-		rcode_depth rcode_norm rcode_ident dcglare rcrop
+		rcode_depth rcode_norm rcode_ident dcglare rcrop rcomb pvsum
 
 LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
 klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \
-hsv_rgb.cal minimalBSDFt.xml WINDOW6BSDFt.xml
+cieskyscan.cal hsv_rgb.cal minimalBSDFt.xml WINDOW6BSDFt.xml
 
 all:	$(PROGS)
 
@@ -117,9 +117,9 @@ glrad:	glrad.o
 	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
 -lX11 -lXext $(MLIB)
 
-dctimestep:	dctimestep.o cmbsdf.o cmatrix.o
-	$(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
--lrtrad $(MLIB)
+dctimestep:	dctimestep.o cmbsdf.o cmconst.o cmatrix.o
+	$(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o \
+cmconst.o cmatrix.o -lrtrad $(MLIB)
 
 rttree_reduce:	rttree_reduce.o
 	$(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
@@ -134,10 +134,18 @@ eplus_adduvf:	eplus_adduvf.o eplus_idf.o
 rfluxmtx:	rfluxmtx.o
 	$(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB)
 
-rmtxop:	rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
+rmtxop:	rmtxop.o cmconst.o rmatrix.o cmatrix.o cmbsdf.o rmconvert.o
 	$(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
+cmconst.o rmconvert.o -lrtrad $(MLIB)
+
+rcomb:	rcomb.o cmconst.o rmatrix.o
+	$(CC) $(CFLAGS) -o rcomb rcomb.o cmconst.o rmatrix.o \
 -lrtrad $(MLIB)
 
+pvsum:	pvsum.o cmconst.o rmatrix.o
+	$(CC) $(CFLAGS) -o pvsum pvsum.o cmconst.o rmatrix.o \
+-lrtrad $(MLIB)
+
 wrapBSDF:	wrapBSDF.o
 	$(CC) $(CFLAGS) -o wrapBSDF wrapBSDF.o -lrtrad $(MLIB)
 
@@ -163,10 +171,13 @@ rcode_ident:	rcode_ident.o
 rcrop:		rcrop.o
 	$(CC) $(CFLAGS) -o rcrop rcrop.o -lrtrad -lm
 
-dcglare:	dcglare.o cmbsdf.o cmatrix.o cmglare.o
-	$(CC) $(CFLAGS) -o dcglare dcglare.o cmbsdf.o cmatrix.o cmglare.o \
--lrtrad $(MLIB)
+dcglare:	dcglare.o cmbsdf.o cmconst.o cmatrix.o cmglare.o
+	$(CC) $(CFLAGS) -o dcglare dcglare.o cmbsdf.o cmconst.o cmatrix.o \
+cmglare.o -lrtrad $(MLIB)
 
+rcomb.o:	../common/calcomp.h \
+../common/paths.h ../common/rtprocess.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
@@ -203,7 +214,7 @@ rfluxmtx.o:	../common/rtio.h ../common/random.h ../com
 ../common/platform.h ../common/bsdf.h ../common/bsdf_m.h \
 ../common/paths.h ../common/rtprocess.h
 
-rmtxop.o dctimestep.o cmatrix.o:	../common/platform.h
+rcomb.o rmtxop.o dctimestep.o cmatrix.o:	../common/platform.h
 
 dcglare.o rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
@@ -266,7 +277,8 @@ 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
+pvsum.o rcomb.o 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