--- ray/src/cv/Rmakefile	2004/10/27 23:36:09	2.25
+++ ray/src/cv/Rmakefile	2007/11/21 17:52:04	2.30
@@ -1,4 +1,4 @@
-# RCSid $Id: Rmakefile,v 2.25 2004/10/27 23:36:09 greg Exp $
+# RCSid $Id: Rmakefile,v 2.30 2007/11/21 17:52:04 greg Exp $
 #
 # Makefile for conversion programs
 #
@@ -20,15 +20,17 @@ LIBDIR = /usr/local/lib/ray
 
 MGF_LIB = ../lib/libmgf.a
 
-PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
-mgf2rad rad2mgf mgf2meta mgfilt mgf2inv
+PROGS = ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
+mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
 
-LIBFILES = source.cal tilt.cal lamp.tab
+LIBFILES = source.cal tilt.cal lamp.tab window.cal
 
 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)
 
@@ -36,51 +38,54 @@ 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 -lm
 
 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)
+	$(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)
+	$(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrtrad $(MLIB)
 
 mgfilt:
 	cd mgflib ; rm -f mgfilt ; \
-	make mgfilt CC=$(CC) \
+	make mgfilt CC="$(CC)" \
 		CFLAGS="$(OPT) $(MACH)" ; \
 	mv mgfilt ..
 
 mgf2inv:
 	cd mgflib ; rm -f mgf2inv ; \
-	make mgf2inv CC=$(CC) \
+	make mgf2inv CC="$(CC)" \
 		CFLAGS="$(OPT) $(MACH)" ; \
 	mv mgf2inv ..
 
+3ds2mgf:
+	cd mgflib ; rm -f 3ds2mgf ; \
+	make 3ds2mgf CC=$(CC) \
+		CFLAGS="$(OPT) $(MACH)" ; \
+	mv 3ds2mgf ..
+
 $(MGF_LIB):
 	cd mgflib ; rm -f libmgf.a ; \
-	make libmgf.a CC=$(CC) \
+	make libmgf.a CC="$(CC)" \
 		CFLAGS="$(OPT) $(MACH)" ; \
 	mv libmgf.a ../../lib