--- ray/src/cv/Rmakefile	1994/04/12 17:12:58	2.5
+++ ray/src/cv/Rmakefile	1994/06/22 15:39:49	2.8
@@ -1,6 +1,5 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 # Makefile for conversion programs
 #
 
@@ -18,7 +17,7 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad mgf2rad
 
 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
 
@@ -47,16 +46,32 @@ nff2rad:	nff2rad.o
 lampcolor:	lampcolor.o
 	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
 
-tmesh2rad:	tmesh2rad.o
-	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
+tmesh2rad:	tmesh2rad.o tmesh.o
+	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
 
-obj2rad:	obj2rad.o
-	$(CC) $(CFLAGS) -o obj2rad obj2rad.o -lrt $(MLIB)
+obj2rad:	obj2rad.o trans.o tmesh.o
+	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
 
+mgf2rad:	MGF_LIB mgf2rad.o tmesh.o
+	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
+
+MGF_LIB:
+	cd mgflib ; \
+	make libmgf.a CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
+	cp libmgf.a ../../lib
+
+mgf2rad.o:	mgflib/parser.h tmesh.h
+	$(CC) $(CFLAGS) '-DMEM_PTR=char *' -DNOPROTO -c mgf2rad.c
+
 arch2rad.o trans.o:	trans.h
 
 ies2rad.o lampcolor.o:	../common/color.h
 
 ies2rad.o:	../common/paths.h
 
-tmesh2rad.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+obj2rad.o tmesh2rad.o:	tmesh.h \
+../common/standard.h ../common/mat4.h ../common/fvect.h
+
+obj2rad.o:	trans.h
+
+tmesh.o:	tmesh.h ../common/fvect.h