--- ray/src/cv/Rmakefile	1991/03/06 10:14:12	1.3
+++ ray/src/cv/Rmakefile	1995/04/25 21:40:23	2.13
@@ -1,45 +1,92 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 # Makefile for conversion programs
 #
 
 OPT = -O
 
-MACH =
+MACH = -DBSD
 
-CFLAGS = $(OPT) $(MACH)
+CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 
-INSTDIR = ../../bin
+CC = cc
 
+MLIB = -lm
+
+INSTDIR = /usr/local/bin
+
 LIBDIR = /usr/local/lib/ray
 
-PROGS = thf2rad ies2rad arch2rad nff2rad
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf mgf2meta
 
+LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
+
 all:	$(PROGS)
 
-install:	$(PROGS)
+install:	$(PROGS) $(LIBFILES)
 	cp $(PROGS) $(INSTDIR)
+	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
+	cd mgflib ; make clean
 
 thf2rad:	thf2rad.o
-	cc $(CFLAGS) -o thf2rad thf2rad.o
+	$(CC) $(CFLAGS) -o thf2rad thf2rad.o
 
-ies2rad:	ies2rad.o lamps.o spec_rgb.o fropen.o rexpr.o
-	cc $(CFLAGS) -o ies2rad ies2rad.o lamps.o \
-spec_rgb.o fropen.o rexpr.o
+ies2rad:	ies2rad.o
+	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
 
-arch2rad:	arch2rad.o trans.o savestr.o
-	cc $(CFLAGS) -o arch2rad arch2rad.o trans.o savestr.o
+arch2rad:	arch2rad.o trans.o
+	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
 
 nff2rad:	nff2rad.o
-	cc $(CFLAGS) -o nff2rad nff2rad.o
+	$(CC) $(CFLAGS) -o nff2rad nff2rad.o
 
-fropen.o:	fropen.c
-	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c
+lampcolor:	lampcolor.o
+	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
 
+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 spec_rgb.o:	color.h
+ies2rad.o lampcolor.o:	../common/color.h
+
+ies2rad.o:	../common/paths.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