--- ray/src/util/Rmakefile	2024/05/20 23:21:29	2.107
+++ ray/src/util/Rmakefile	2025/04/19 17:12:59	2.110
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.107 2024/05/20 23:21:29 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.110 2025/04/19 17:12:59 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -24,7 +24,7 @@ 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 rcomb
+		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 \
@@ -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,12 +134,16 @@ 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)
 
-rcomb:	rcomb.o rmatrix.o cmatrix.o cmbsdf.o
-	$(CC) $(CFLAGS) -o rcomb rcomb.o rmatrix.o cmatrix.o cmbsdf.o \
+pvsum:	pvsum.o cmconst.o rmatrix.o
+	$(CC) $(CFLAGS) -o pvsum pvsum.o cmconst.o rmatrix.o \
 -lrtrad $(MLIB)
 
 wrapBSDF:	wrapBSDF.o
@@ -167,11 +171,11 @@ 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/rtio.h \
+rcomb.o:	../common/calcomp.h \
 ../common/paths.h ../common/rtprocess.h
 
 eplus_adduvf.o:	../common/triangulate.h ../common/rtprocess.h \
@@ -273,7 +277,8 @@ rttree_reduce.o:	../common/rtio.h ../common/rterror.h
 
 rmatrix.o:	rmatrix.h cmatrix.h ../common/resolu.h
 
-rcomb.o 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