--- ray/src/cv/Rmakefile	2013/11/08 23:32:54	2.42
+++ ray/src/cv/Rmakefile	2014/03/26 22:29:08	2.48
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.42 2013/11/08 23:32:54 greg Exp $
+# RCSid $Id: Rmakefile,v 2.48 2014/03/26 22:29:08 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -8,9 +8,11 @@ OPT = -O
 MACH = -DBSD
 
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CXXFLAGS = $(CFLAGS)
 METACFLAGS = -I../meta
 
 CC = cc
+CXX = c++
 
 MLIB = -lm
 
@@ -73,9 +75,9 @@ mgf2inv:	mgf2inv.o
 	$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
 -lmgf -lrtrad $(MLIB)
 
-pabopto2bsdf:	pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o
-	$(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
-bsdfrbf.o bsdfmesh.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)
 
 pabopto2rad:	pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
 	$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
@@ -88,6 +90,10 @@ bsdf2rad:	bsdf2rad.o bsdfrep.o bsdfinterp.o
 	$(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.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)
+
 bsdf2ttree:	bsdf2ttree.o bsdfrep.o bsdfinterp.o
 	$(CC) $(CFLAGS) -o bsdf2ttree bsdf2ttree.o bsdfrep.o bsdfinterp.o \
 -lrtrad $(MLIB)
@@ -136,9 +142,17 @@ mgf2inv.o:	../common/mgf_parser.h ../common/ccolor.h
 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 \
+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
 
 bsdf2ttree.o pabopto2bsdf.o:	../common/platform.h
 
 bsdfrep.o:	../common/resolu.h ../common/rtio.h
+
+pabopto2bsdf.o:	../common/resolu.h
+
+bsdf2rad.o bsdf2ttree.o:	../common/rtprocess.h
+
+bsdf2klems.o bsdf2ttree.o mgf2meta.o:	../common/random.h
+
+bsdftrans.o:	transportSimplex.h