--- ray/src/cv/Rmakefile	1994/06/22 15:39:49	2.8
+++ ray/src/cv/Rmakefile	1994/12/12 12:35:46	2.11
@@ -17,7 +17,8 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad mgf2rad
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf
 
 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
 
@@ -30,6 +31,7 @@ install:	$(PROGS) $(LIBFILES)
 
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
+	cd mgflib ; make clean
 
 thf2rad:	thf2rad.o
 	$(CC) $(CFLAGS) -o thf2rad thf2rad.o
@@ -55,9 +57,13 @@ obj2rad:	obj2rad.o trans.o tmesh.o
 mgf2rad:	MGF_LIB mgf2rad.o tmesh.o
 	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
 
+rad2mgf:	rad2mgf.o
+	$(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
+
 MGF_LIB:
 	cd mgflib ; \
-	make libmgf.a CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
+	make libmgf.a CC=$(CC) \
+		CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
 	cp libmgf.a ../../lib
 
 mgf2rad.o:	mgflib/parser.h tmesh.h
@@ -75,3 +81,6 @@ obj2rad.o tmesh2rad.o:	tmesh.h \
 obj2rad.o:	trans.h
 
 tmesh.o:	tmesh.h ../common/fvect.h
+
+rad2mgf.o:	../common/fvect.h ../common/object.h ../common/color.h \
+../common/lookup.h