--- ray/src/ot/Rmakefile	2003/03/11 22:48:20	2.9
+++ ray/src/ot/Rmakefile	2016/04/21 00:40:35	2.19
@@ -1,15 +1,16 @@
-# RCSid: $Id: Rmakefile,v 2.9 2003/03/11 22:48:20 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.19 2016/04/21 00:40:35 greg Exp $
 #
 #  Compiles for octree conversion program
 #
 #     The compile define "STRICT" enforces strict intersection calculations
 #  so that no cube which does not intersect an object contains that object.
 #  Otherwise, a somewhat faster more lax approach is taken by certain routines.
+#  This is set to "1" by default, so -DSTRICT=0 now turns it off.
 #
 
 OPT = -O
 MACH = -DBSD
-CFLAGS = -DSTRICT -I../common -L../lib $(OPT) $(MACH)
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
 CC = cc
 MLIB = -lm
 
@@ -17,32 +18,36 @@ LIBDIR = /usr/local/lib/ray
 
 INSTDIR = /usr/local/bin
 
-all:	oconv getbbox obj2mesh
+PROGS =	oconv getbbox obj2mesh
 
+all:	$(PROGS)
+
 oconv:	oconv.o sphere.o writeoct.o o_face.o \
 o_cone.o o_instance.o bbox.o initotypes.o
 	$(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
 o_cone.o o_instance.o bbox.o \
-initotypes.o -lrt $(MLIB)
+initotypes.o -lrtrad $(MLIB)
 
 getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
 	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
-bbox.o init2otypes.o -lrt $(MLIB)
+bbox.o init2otypes.o -lrtrad $(MLIB)
 
 obj2mesh:	obj2mesh.o cvmesh.o wfconv.o o_face.o writemesh.o
 	$(CC) $(CFLAGS) -o obj2mesh obj2mesh.o cvmesh.o wfconv.o \
-o_face.o writemesh.o -lrt $(MLIB)
+o_face.o writemesh.o -lrtrad $(MLIB)
 
-install:	oconv getbbox obj2mesh
-	cp oconv getbbox obj2mesh $(INSTDIR)
+install:	$(PROGS)
+	cp $(PROGS) $(INSTDIR)
 
 clean:
-	set nonomatch; rm -f oconv getbbox *.o core
+	set nonomatch; rm -f $(PROGS) *.o
 
 bbox.o initotypes.o o_cone.o o_face.o \
 o_instance.o oconv.o sphere.o \
 cvmesh.o obj2mesh.o wfconv.o \
-writeoct.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+writeoct.o:	../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 initotypes.o o_cone.o o_face.o oconv.o \
 sphere.o writeoct.o:	../common/octree.h
@@ -50,9 +55,10 @@ sphere.o writeoct.o:	../common/octree.h
 bbox.o o_cone.o o_face.o o_instance.o oconv.o \
 sphere.o writeoct.o:	../common/object.h
 
-bbox.o initotypes.o oconv.o obj2mesh.o \
-sphere.o writeoct.o:	../common/otypes.h
+bbox.o initotypes.o oconv.o obj2mesh.o sphere.o:	../common/otypes.h
 
+bbox.o getbbox.o initotypes.o oconv.o readobj2.o writeoct.o: oconv.h
+
 oconv.o:	../common/paths.h
 
 bbox.o o_cone.o:	../common/cone.h
@@ -71,4 +77,4 @@ initotypes.o init2otypes.o:	../common/otypes.h
 cvmesh.o obj2mesh.o wfconv.o:	cvmesh.h \
 ../common/octree.h ../common/object.h ../common/mesh.h
 
-cvmesh.o:	../common/otypes.h ../common/face.h
+cvmesh.o:	../common/otypes.h ../common/face.h ../common/tmesh.h