--- ray/src/ot/Rmakefile	1991/10/23 13:43:35	1.24
+++ ray/src/ot/Rmakefile	1994/04/14 05:02:05	2.5
@@ -9,8 +9,10 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN
+MACH = -DBSD
 CFLAGS = -DSTRICT $(OPT) $(MACH) -I../common -L../lib
+CC = cc
+MLIB = -lm
 
 LIBDIR = /usr/local/lib/ray
 
@@ -20,13 +22,13 @@ all:	oconv getbbox
 
 oconv:	oconv.o sphere.o writeoct.o o_face.o plocate.o \
 clip.o o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
-	cc $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
+	$(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
 plocate.o clip.o o_cone.o o_instance.o bbox.o readfargs.o \
-initotypes.o malloc.o -lrt -lm
+initotypes.o malloc.o -lrt $(MLIB)
 
-getbbox:	getbbox.o readobj2.o bbox.o initotypes2.o
-	cc $(CFLAGS) -o getbbox getbbox.o readobj2.o \
-bbox.o initotypes2.o -lrt -lm
+getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
+	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
+bbox.o init2otypes.o -lrt $(MLIB)
 
 install:	oconv getbbox
 	cp oconv getbbox $(INSTDIR)
@@ -34,11 +36,8 @@ install:	oconv getbbox
 clean:
 	set nonomatch; rm -f oconv getbbox *.o core
 
-oconv.o:	oconv.c
-	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c oconv.c
-
 readfargs.o:	readfargs.c ../common/object.h
-	cc $(CFLAGS) -DMEMHOG -c readfargs.c
+	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
 
 bbox.o initotypes.o o_cone.o o_face.o \
 o_instance.o oconv.o sphere.o \
@@ -53,6 +52,8 @@ sphere.o writeoct.o:	../common/object.h
 bbox.o initotypes.o oconv.o \
 sphere.o writeoct.o:	../common/otypes.h
 
+oconv.o:	../common/paths.h
+
 bbox.o o_cone.o:	../common/cone.h
 
 bbox.o o_face.o:	../common/face.h
@@ -63,4 +64,4 @@ clip.o o_face.o plocate.o:	plocate.h
 
 clip.o plocate.o:	../common/fvect.h
 
-initotypes.o initotypes2.o:	../common/otypes.h
+initotypes.o init2otypes.o:	../common/otypes.h