--- ray/src/cv/Rmakefile	1992/09/08 10:05:15	2.3
+++ ray/src/cv/Rmakefile	2004/10/27 23:36:09	2.25
@@ -1,5 +1,4 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid $Id: Rmakefile,v 2.25 2004/10/27 23:36:09 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -8,33 +7,40 @@ OPT = -O
 
 MACH = -DBSD
 
-CFLAGS = $(OPT) $(MACH) -I../common -L../lib
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+METACFLAGS = -I../meta
 
 CC = cc
 
+MLIB = -lm
+
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor
+MGF_LIB = ../lib/libmgf.a
 
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv
+
 LIBFILES = source.cal tilt.cal lamp.tab
 
 all:	$(PROGS)
 
 install:	$(PROGS) $(LIBFILES)
 	cp $(PROGS) $(INSTDIR)
-	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
 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
@@ -45,8 +51,57 @@ nff2rad:	nff2rad.o
 lampcolor:	lampcolor.o
 	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
 
+tmesh2rad:	tmesh2rad.o
+	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
+
+obj2rad:	obj2rad.o trans.o
+	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrt $(MLIB)
+
+mgf2rad:	$(MGF_LIB) mgf2rad.o
+	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.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)
+
+mgfilt:
+	cd mgflib ; rm -f mgfilt ; \
+	make mgfilt CC=$(CC) \
+		CFLAGS="$(OPT) $(MACH)" ; \
+	mv mgfilt ..
+
+mgf2inv:
+	cd mgflib ; rm -f mgf2inv ; \
+	make mgf2inv CC=$(CC) \
+		CFLAGS="$(OPT) $(MACH)" ; \
+	mv mgf2inv ..
+
+$(MGF_LIB):
+	cd mgflib ; rm -f libmgf.a ; \
+	make libmgf.a CC=$(CC) \
+		CFLAGS="$(OPT) $(MACH)" ; \
+	mv libmgf.a ../../lib
+
+mgf2rad.o:	mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h
+	$(CC) $(CFLAGS) -c mgf2rad.c
+
+mgf2meta.o:	mgf2meta.c mgflib/parser.h
+	$(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c
+
 arch2rad.o trans.o:	trans.h
 
 ies2rad.o lampcolor.o:	../common/color.h
 
 ies2rad.o:	../common/paths.h
+
+obj2rad.o tmesh2rad.o:	../common/tmesh.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/rterror.h ../common/mat4.h \
+../common/fvect.h ../common/tifftypes.h
+
+obj2rad.o:	trans.h
+
+rad2mgf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h \
+../common/object.h ../common/color.h ../common/lookup.h