--- ray/src/cv/Rmakefile	1994/02/15 15:59:57	2.4
+++ ray/src/cv/Rmakefile	1995/04/25 21:40:23	2.13
@@ -1,6 +1,5 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 # Makefile for conversion programs
 #
 
@@ -18,7 +17,8 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf mgf2meta
 
 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
 
@@ -31,12 +31,13 @@ install:	$(PROGS) $(LIBFILES)
 
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
+	cd mgflib ; make clean
 
 thf2rad:	thf2rad.o
 	$(CC) $(CFLAGS) -o thf2rad thf2rad.o
 
 ies2rad:	ies2rad.o
-	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt
+	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
 
 arch2rad:	arch2rad.o trans.o
 	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
@@ -47,13 +48,45 @@ 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 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)
+
+rad2mgf:	rad2mgf.o
+	$(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
+
+mgf2meta:	MGF_LIB mgf2meta.o
+	$(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
+
+MGF_LIB:
+	cd mgflib ; rm -f libmgf.a ; \
+	make libmgf.a CC=$(CC) \
+		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
+
+mgf2meta.o:	mgflib/parser.h
+	$(CC) $(CFLAGS) '-DMEM_PTR=char *' -DNOPROTO -c mgf2meta.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
+
+rad2mgf.o:	../common/fvect.h ../common/object.h ../common/color.h \
+../common/lookup.h