--- ray/src/cv/Rmakefile	2014/03/27 03:49:14	2.49
+++ ray/src/cv/Rmakefile	2020/03/30 18:28:35	2.56
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.49 2014/03/27 03:49:14 greg Exp $
+# RCSid $Id: Rmakefile,v 2.56 2020/03/30 18:28:35 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -20,11 +20,11 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
-mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
-pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea
+PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad robjutil \
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf bsdfquery \
+pabopto2xyz pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea bsdf2rad
 
-LIBFILES = source.cal tilt.cal lamp.tab window.cal
+LIBFILES = source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
 
 all:	$(PROGS)
 
@@ -36,7 +36,7 @@ install:	$(PROGS) $(LIBFILES) optics2rad.csh
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o
 
 ies2rad:	ies2rad.o
 	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
@@ -75,6 +75,10 @@ mgf2inv:	mgf2inv.o
 	$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
 -lmgf -lrtrad $(MLIB)
 
+pabopto2xyz:	pabopto2xyz.o
+	$(CXX) $(CXXFLAGS) -o pabopto2xyz pabopto2xyz.o \
+-lrtrad $(MLIB)
+
 pabopto2bsdf:	pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o bsdftrans.o
 	$(CXX) $(CXXFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
 bsdfrbf.o bsdfmesh.o bsdftrans.o -lrtrad $(MLIB)
@@ -90,6 +94,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)
@@ -108,6 +116,10 @@ pkgBSDF:	pkgBSDF.o
 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
@@ -156,3 +168,7 @@ bsdf2rad.o bsdf2ttree.o:	../common/rtprocess.h
 bsdf2klems.o bsdf2ttree.o mgf2meta.o:	../common/random.h
 
 bsdftrans.o:	transportSimplex.h
+
+bsdfquery.o:	../common/rtmath.h ../common/rtio.h bsdfrep.h
+
+robjutil.o:	../common/objutil.h