--- ray/src/cv/Rmakefile	2013/04/21 23:01:14	2.39
+++ ray/src/cv/Rmakefile	2013/11/21 23:57:28	2.43
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.39 2013/04/21 23:01:14 greg Exp $
+# RCSid $Id: Rmakefile,v 2.43 2013/11/21 23:57:28 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -20,7 +20,7 @@ LIBDIR = /usr/local/lib/ray
 
 PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
 mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
-pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF
+pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea
 
 LIBFILES = source.cal tilt.cal lamp.tab window.cal
 
@@ -77,6 +77,21 @@ pabopto2bsdf:	pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfm
 	$(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
 bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
 
+pabopto2rad:	pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
+	$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
+bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
+
+pabopto2rad.o:	pabopto2bsdf.c bsdfrep.h
+	$(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c
+
+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)
@@ -88,6 +103,9 @@ bsdf2klems:	bsdf2klems.o bsdfrep.o bsdfinterp.o
 pkgBSDF:	pkgBSDF.o
 	$(CC) $(CFLAGS) -o pkgBSDF pkgBSDF.o -lrtrad $(MLIB)
 
+epw2wea:	epw2wea.o
+	$(CC) $(CFLAGS) -o epw2wea epw2wea.o
+
 mgf2rad.o:	mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \
 ../common/color.h
 	$(CC) $(CFLAGS) -c mgf2rad.c
@@ -122,7 +140,7 @@ 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 \
+bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \
 pabopto2bsdf.o:	bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
 
 bsdf2ttree.o pabopto2bsdf.o:	../common/platform.h