--- ray/src/cv/Rmakefile	2003/06/27 06:53:22	2.22
+++ ray/src/cv/Rmakefile	2004/11/05 03:31:37	2.26
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.22 2003/06/27 06:53:22 greg Exp $
+# RCSid $Id: Rmakefile,v 2.26 2004/11/05 03:31:37 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -8,6 +8,7 @@ OPT = -O
 MACH = -DBSD
 
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+METACFLAGS = -I../meta
 
 CC = cc
 
@@ -19,7 +20,7 @@ LIBDIR = /usr/local/lib/ray
 
 MGF_LIB = ../lib/libmgf.a
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+PROGS = ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
 mgf2rad rad2mgf mgf2meta mgfilt mgf2inv
 
 LIBFILES = source.cal tilt.cal lamp.tab
@@ -28,16 +29,13 @@ 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 -lm
 
@@ -87,7 +85,7 @@ mgf2rad.o:	mgf2rad.c mgflib/parser.h ../common/tmesh.h
 	$(CC) $(CFLAGS) -c mgf2rad.c
 
 mgf2meta.o:	mgf2meta.c mgflib/parser.h
-	$(CC) $(CFLAGS) -c mgf2meta.c
+	$(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c
 
 arch2rad.o trans.o:	trans.h
 
@@ -97,7 +95,8 @@ 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/rtmath.h ../common/rterror.h ../common/mat4.h \
+../common/fvect.h ../common/tifftypes.h
 
 obj2rad.o:	trans.h