--- ray/src/cv/Rmakefile	2004/10/27 23:36:09	2.25
+++ ray/src/cv/Rmakefile	2011/02/18 00:40:25	2.35
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.25 2004/10/27 23:36:09 greg Exp $
+# RCSid $Id: Rmakefile,v 2.35 2011/02/18 00:40:25 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -18,76 +18,65 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-MGF_LIB = ../lib/libmgf.a
+PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
-mgf2rad rad2mgf mgf2meta mgfilt mgf2inv
+LIBFILES = source.cal tilt.cal lamp.tab window.cal
 
-LIBFILES = source.cal tilt.cal lamp.tab
-
 all:	$(PROGS)
 
-install:	$(PROGS) $(LIBFILES)
+install:	$(PROGS) $(LIBFILES) optics2rad.csh
 	cp $(PROGS) $(INSTDIR)
+	cp optics2rad.csh $(INSTDIR)/optics2rad
+	chmod 755 $(INSTDIR)/optics2rad
 	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
+	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
 
 arch2rad:	arch2rad.o trans.o
-	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
+	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrtrad
 
 nff2rad:	nff2rad.o
 	$(CC) $(CFLAGS) -o nff2rad nff2rad.o
 
 lampcolor:	lampcolor.o
-	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
+	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrtrad
 
 tmesh2rad:	tmesh2rad.o
-	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrtrad $(MLIB)
 
 obj2rad:	obj2rad.o trans.o
-	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrtrad $(MLIB)
 
-mgf2rad:	$(MGF_LIB) mgf2rad.o
-	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.o -lmgf -lrt $(MLIB)
+mgf2rad:	mgf2rad.o
+	$(CC) $(CFLAGS) -o mgf2rad mgf2rad.o -lmgf -lrtrad $(MLIB)
 
 rad2mgf:	rad2mgf.o
-	$(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrtrad $(MLIB)
 
-mgf2meta:	$(MGF_LIB) mgf2meta.o
-	$(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
+mgf2meta:	mgf2meta.o
+	$(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrtrad $(MLIB)
 
-mgfilt:
-	cd mgflib ; rm -f mgfilt ; \
-	make mgfilt CC=$(CC) \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	mv mgfilt ..
+mgfilt:	mgfilt.o
+	$(CC) $(CFLAGS) -o mgfilt mgfilt.o -lmgf -lrtrad $(MLIB)
 
-mgf2inv:
-	cd mgflib ; rm -f mgf2inv ; \
-	make mgf2inv CC=$(CC) \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	mv mgf2inv ..
+mgf2inv:	mgf2inv.o
+	$(CC) $(CFLAGS) -o mgf2inv mgf2inv.o -lmgf -lrtrad $(MLIB)
 
-$(MGF_LIB):
-	cd mgflib ; rm -f libmgf.a ; \
-	make libmgf.a CC=$(CC) \
-		CFLAGS="$(OPT) $(MACH)" ; \
-	mv libmgf.a ../../lib
+3ds2mgf:	3ds2mgf.o rayopt3ds.o vect3ds.o
+	$(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
+-lmgf -lrtrad $(MLIB)
 
-mgf2rad.o:	mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h
+mgf2rad.o:	mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \
+../common/color.h
 	$(CC) $(CFLAGS) -c mgf2rad.c
 
-mgf2meta.o:	mgf2meta.c mgflib/parser.h
+mgf2meta.o:	mgf2meta.c ../common/mgf_parser.h
 	$(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c
 
 arch2rad.o trans.o:	trans.h
@@ -99,9 +88,17 @@ 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
+../common/fvect.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
+
+mgfilt.o:	../common/mgf_parser.h ../common/ccolor.h
+
+mgf2inv.o:	../common/mgf_parser.h ../common/ccolor.h
+
+3ds2mgf.o rayopt3ds.o:	rayopt3ds.h
+
+3ds2mgf.o rayopt3ds.o vect3ds.o:	vect3ds.h