--- ray/src/util/Rmakefile	2020/11/24 16:30:15	2.99
+++ ray/src/util/Rmakefile	2024/02/26 18:22:16	2.106
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.99 2020/11/24 16:30:15 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.106 2024/02/26 18:22:16 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -15,6 +15,8 @@ CC = cc
 
 SPECIAL =
 
+INSTALL = cp
+
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
@@ -22,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
+		rcode_depth rcode_norm rcode_ident dcglare rcrop rcomb
 
 LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
 klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \
-minimalBSDFt.xml WINDOW6BSDFt.xml
+cieskyscan.cal hsv_rgb.cal minimalBSDFt.xml WINDOW6BSDFt.xml
 
 all:	$(PROGS)
 
@@ -34,7 +36,7 @@ install:	all $(SPECIAL) objview.pl objpict.pl glare.cs
 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 rtpict.pl rcode2bmp.pl $(LIBFILES)
-	cp $(PROGS) $(INSTDIR)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
 	cp objpict.pl $(INSTDIR)/objpict
@@ -136,6 +138,10 @@ rmtxop:	rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
 	$(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
 -lrtrad $(MLIB)
 
+rcomb:	rcomb.o rmatrix.o cmatrix.o cmbsdf.o
+	$(CC) $(CFLAGS) -o rcomb rcomb.o rmatrix.o cmatrix.o cmbsdf.o \
+-lrtrad $(MLIB)
+
 wrapBSDF:	wrapBSDF.o
 	$(CC) $(CFLAGS) -o wrapBSDF wrapBSDF.o -lrtrad $(MLIB)
 
@@ -158,10 +164,16 @@ rcode_norm:	rcode_norm.o
 rcode_ident:	rcode_ident.o
 	$(CC) $(CFLAGS) -o rcode_ident rcode_ident.o -lrtrad
 
+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)
 
+rcomb.o:	../common/calcomp.h ../common/rtio.h \
+../common/paths.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
@@ -198,7 +210,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 \
@@ -261,7 +273,7 @@ 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
+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
@@ -291,3 +303,6 @@ rcode_ident.o:	../common/idmap.h ../common/resolu.h \
 ../common/platform.h ../common/rtio.h ../common/lookup.h
 
 dcglare.o:	../common/platform.h ../common/resolu.h cmglare.h
+
+rcrop.o:	../common/platform.h ../common/resolu.h \
+../common/color.h ../common/fvect.h ../common/view.h ../common/rtio.h