--- ray/src/cv/Rmakefile	2017/04/09 21:39:26	2.53
+++ ray/src/cv/Rmakefile	2024/02/26 23:43:35	2.59
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.53 2017/04/09 21:39:26 greg Exp $
+# RCSid $Id: Rmakefile,v 2.59 2024/02/26 23:43:35 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -20,8 +20,8 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
-mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
+PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad robjutil \
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf bsdfquery checkBSDF \
 pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea bsdf2rad
 
 LIBFILES = source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
@@ -31,7 +31,8 @@ all:	$(PROGS)
 install:	$(PROGS) $(LIBFILES) optics2rad.csh
 	cp $(PROGS) $(INSTDIR)
 	cp optics2rad.csh $(INSTDIR)/optics2rad
-	chmod 755 $(INSTDIR)/optics2rad
+	cp iso2klems.pl $(INSTDIR)/iso2klems
+	chmod 755 $(INSTDIR)/optics2rad $(INSTDIR)/iso2klems
 	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
@@ -94,6 +95,10 @@ bsdf2rad:	bsdf2rad.o bsdfrep.o bsdfinterp.o
 	$(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \
 -lrtrad $(MLIB)
 
+bsdf2rado:	bsdf2rado.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdf2rado bsdf2rado.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
 bsdfquery:	bsdfquery.o bsdfrep.o bsdfinterp.o
 	$(CC) $(CFLAGS) -o bsdfquery bsdfquery.o bsdfrep.o bsdfinterp.o \
 -lrtrad $(MLIB)
@@ -109,9 +114,16 @@ bsdf2klems:	bsdf2klems.o bsdfrep.o bsdfinterp.o
 pkgBSDF:	pkgBSDF.o
 	$(CC) $(CFLAGS) -o pkgBSDF pkgBSDF.o -lrtrad $(MLIB)
 
+checkBSDF:	checkBSDF.o
+	$(CC) $(CFLAGS) -o checkBSDF checkBSDF.o -lrtrad $(MLIB)
+
 epw2wea:	epw2wea.o
 	$(CC) $(CFLAGS) -o epw2wea epw2wea.o
 
+robjutil:	robjutil.o
+	$(CC) $(CFLAGS) -o robjutil robjutil.o \
+-lwfobj -lrtrad $(MLIB)
+
 mgf2rad.o:	mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \
 ../common/color.h
 	$(CC) $(CFLAGS) -c mgf2rad.c
@@ -143,8 +155,8 @@ mgf2inv.o:	../common/mgf_parser.h ../common/ccolor.h
 
 3ds2mgf.o rayopt3ds.o vect3ds.o:	vect3ds.h
 
-pkgBSDF.o:	../common/bsdf.h ../common/fvect.h ../common/ccolor.h \
-../common/paths.h
+checkBSDF.o pkgBSDF.o:	../common/bsdf.h ../common/fvect.h \
+../common/ccolor.h ../common/paths.h
 
 bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o bsdftrans.o \
 pabopto2bsdf.o:	bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
@@ -157,8 +169,12 @@ pabopto2bsdf.o:	../common/resolu.h
 
 bsdf2rad.o bsdf2ttree.o:	../common/rtprocess.h
 
-bsdf2klems.o bsdf2ttree.o mgf2meta.o:	../common/random.h
+bsdf2klems.o bsdf2ttree.o mgf2meta.o:	../common/random.h ../common/calcomp.h
 
 bsdftrans.o:	transportSimplex.h
 
 bsdfquery.o:	../common/rtmath.h ../common/rtio.h bsdfrep.h
+
+checkBSDF.o:	../common/rtio.h ../common/bsdf_m.h ../common/bsdf_t.h
+
+robjutil.o:	../common/objutil.h