--- ray/src/cv/Rmakefile	2010/11/29 17:22:30	2.34
+++ ray/src/cv/Rmakefile	2014/04/26 15:59:38	2.50
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.34 2010/11/29 17:22:30 greg Exp $
+# RCSid $Id: Rmakefile,v 2.50 2014/04/26 15:59:38 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
 
@@ -18,10 +20,9 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-MGF_LIB = ../lib/libmgf.a
-
 PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
-mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
+pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea
 
 LIBFILES = source.cal tilt.cal lamp.tab window.cal
 
@@ -35,8 +36,7 @@ install:	$(PROGS) $(LIBFILES) optics2rad.csh
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
-	cd mgflib ; $(MAKE) clean
+	set nonomatch; rm -f $(PROGS) *.o
 
 ies2rad:	ies2rad.o
 	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
@@ -56,43 +56,63 @@ tmesh2rad:	tmesh2rad.o
 obj2rad:	obj2rad.o trans.o
 	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrtrad $(MLIB)
 
-mgf2rad:	$(MGF_LIB) mgf2rad.o
+mgf2rad:	mgf2rad.o
 	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.o -lmgf -lrtrad $(MLIB)
 
 rad2mgf:	rad2mgf.o
 	$(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrtrad $(MLIB)
 
-mgf2meta:	$(MGF_LIB) mgf2meta.o
+mgf2meta:	mgf2meta.o
 	$(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrtrad $(MLIB)
 
-mgfilt:
-	cd mgflib ; rm -f mgfilt ; \
-	$(MAKE) mgfilt CC="$(CC)" \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	cp -p mgfilt ..
+mgfilt:	mgfilt.o
+	$(CC) $(CFLAGS) -o mgfilt mgfilt.o -lmgf -lrtrad $(MLIB)
 
-mgf2inv:
-	cd mgflib ; rm -f mgf2inv ; \
-	$(MAKE) mgf2inv CC="$(CC)" \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	cp -p mgf2inv ..
+mgf2inv:	mgf2inv.o
+	$(CC) $(CFLAGS) -o mgf2inv mgf2inv.o -lmgf -lrtrad $(MLIB)
 
-3ds2mgf:
-	cd mgflib ; rm -f 3ds2mgf ; \
-	$(MAKE) 3ds2mgf CC="$(CC)" \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	cp -p 3ds2mgf ..
+3ds2mgf:	3ds2mgf.o rayopt3ds.o vect3ds.o
+	$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
+-lmgf -lrtrad $(MLIB)
 
-$(MGF_LIB):
-	cd mgflib ; rm -f libmgf.a ; \
-	$(MAKE) libmgf.a CC="$(CC)" \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	cp -p libmgf.a ../../lib
+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)
 
-mgf2rad.o:	mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h
+pabopto2rad:	pabopto2rad.o bsdfrep.o bsdfrbf.o 
+	$(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
+bsdfrbf.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)
+
+bsdf2klems:	bsdf2klems.o bsdfrep.o bsdfinterp.o
+	$(CC) $(CFLAGS) -o bsdf2klems bsdf2klems.o bsdfrep.o bsdfinterp.o \
+-lrtrad $(MLIB)
+
+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
 
-mgf2meta.o:	mgf2meta.c mgflib/parser.h
+mgf2meta.o:	mgf2meta.c ../common/mgf_parser.h
 	$(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c
 
 arch2rad.o trans.o:	trans.h
@@ -110,3 +130,29 @@ obj2rad.o:	trans.h
 
 rad2mgf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h \
 ../common/object.h ../common/color.h ../common/lookup.h
+
+mgfilt.o:	../common/mgf_parser.h ../common/ccolor.h
+
+mgf2inv.o:	../common/mgf_parser.h ../common/ccolor.h
+
+3ds2mgf.o rayopt3ds.o:	rayopt3ds.h
+
+3ds2mgf.o rayopt3ds.o vect3ds.o:	vect3ds.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 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