--- ray/src/ot/Rmakefile	2004/10/27 23:36:09	2.15
+++ ray/src/ot/Rmakefile	2023/02/09 00:18:05	2.20
@@ -1,18 +1,21 @@
-# RCSid: $Id: Rmakefile,v 2.15 2004/10/27 23:36:09 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.20 2023/02/09 00:18:05 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
 
+INSTALL = cp
+
 LIBDIR = /usr/local/lib/ray
 
 INSTDIR = /usr/local/bin
@@ -25,28 +28,28 @@ 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:	$(PROGS)
-	cp $(PROGS) $(INSTDIR)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.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/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.h ../common/tifftypes.h
+../common/rterror.h
 
 initotypes.o o_cone.o o_face.o oconv.o \
 sphere.o writeoct.o:	../common/octree.h