--- ray/src/util/Rmakefile	2019/07/19 22:25:03	2.91
+++ ray/src/util/Rmakefile	2023/02/09 00:18:05	2.102
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.91 2019/07/19 22:25:03 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.102 2023/02/09 00:18:05 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,19 +24,19 @@ 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
+		rcode_depth rcode_norm rcode_ident dcglare rcrop
 
 LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
 klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \
-minimalBSDFt.xml WINDOW6BSDFt.xml
+hsv_rgb.cal minimalBSDFt.xml WINDOW6BSDFt.xml
 
 all:	$(PROGS)
 
 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 rtpict.pl $(LIBFILES)
-	cp $(PROGS) $(INSTDIR)
+genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl rcode2bmp.pl $(LIBFILES)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
 	cp objpict.pl $(INSTDIR)/objpict
@@ -54,10 +56,12 @@ genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl $(LIBFIL
 	cp ltview.pl $(INSTDIR)/ltview
 	cp ltpict.pl $(INSTDIR)/ltpict
 	cp rtpict.pl $(INSTDIR)/rtpict
+	cp rcode2bmp.pl $(INSTDIR)/rcode2bmp
 	cd $(INSTDIR) ; chmod 755 objview objpict \
 		glare dayfact debugcal rlux raddepend objline \
 		compamb vinfo genambpos fieldcomb genklemsamp \
-		genskyvec genBSDF rtpict
+		genskyvec genBSDF rtpict rcode2bmp bsdfview \
+		ltview ltpict
 	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
@@ -145,17 +149,24 @@ radcompare:	radcompare.o
 
 setscan.o:	setscan.h
 
-rcode_depth:	rcode_depth.o depthcodec.o
-	$(CC) $(CFLAGS) -o rcode_depth rcode_depth.o depthcodec.o \
+rcode_depth:	rcode_depth.o
+	$(CC) $(CFLAGS) -o rcode_depth rcode_depth.o \
 -lrtrad $(MLIB)
 
-rcode_norm:	rcode_norm.o normcodec.o
-	$(CC) $(CFLAGS) -o rcode_norm rcode_norm.o normcodec.o \
+rcode_norm:	rcode_norm.o
+	$(CC) $(CFLAGS) -o rcode_norm rcode_norm.o \
 -lrtrad $(MLIB)
 
-rcode_ident:	rcode_ident.o idmap.o
-	$(CC) $(CFLAGS) -o rcode_ident rcode_ident.o idmap.o -lrtrad
+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)
+
 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
@@ -189,11 +200,12 @@ cmbsdf.o:	../common/paths.h ../common/bsdf.h ../common
 
 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
+../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
 
-rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
+dcglare.o rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
 ../common/rterror.h
@@ -241,7 +253,7 @@ rsensor.o:	../rt/ray.h ../common/octree.h \
 
 rsensor.o:	../common/view.h ../common/resolu.h ../rt/source.h
 
-radcompare.o rcollate.o:	../common/platform.h \
+ rcollate.o:	../common/platform.h \
 ../common/rtio.h ../common/resolu.h
 
 Version.c:	../rt/Version.c
@@ -264,24 +276,26 @@ pictool.o evalglare.o:	pictool.h ../common/g3vector.h 
 
 evalglare.o:	../common/rtio.h
 
-radcompare.o:	../common/rtio.h ../common/color.h ../common/lookup.h
+radcompare.o:	../common/rtio.h ../common/color.h ../common/lookup.h \
+../common/platform.h ../common/normcodec.h ../common/depthcodec.h \
+../common/rtmath.h ../common/view.h
 
 pictool.o:	../common/view.h ../common/color.h
 
 getinfo.o:	../common/rtprocess.h ../common/platform.h ../common/resolu.h
 
-rcode_depth.o depthcodec.o:	depthcodec.h \
-../common/view.h ../common/fvect.h ../common/resolu.h ../common/rtio.h
+rcode_depth.o:	../common/depthcodec.h \
+../common/view.h ../common/fvect.h ../common/resolu.h ../common/rtio.h \
+../common/platform.h
 
-rcode_depth.o:	../common/platform.h
-
-rcode_norm.o normcodec.o:	normcodec.h \
+rcode_norm.o:	../common/normcodec.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/resolu.h ../common/rtio.h
+../common/resolu.h ../common/rtio.h ../common/platform.h
 
-rcode_norm.o:	../common/platform.h
+rcode_ident.o:	../common/idmap.h ../common/resolu.h \
+../common/platform.h ../common/rtio.h ../common/lookup.h
 
-rcode_ident.o idmap.o:	idmap.h ../common/resolu.h \
-../common/platform.h ../common/rtio.h
+dcglare.o:	../common/platform.h ../common/resolu.h cmglare.h
 
-rcode_ident.o:	../common/lookup.h
+rcrop.o:	../common/platform.h ../common/resolu.h \
+../common/color.h ../common/fvect.h ../common/view.h ../common/rtio.h