--- ray/src/ot/Rmakefile	1989/02/02 10:33:07	1.1
+++ ray/src/ot/Rmakefile	1992/09/24 21:28:29	2.3
@@ -8,47 +8,60 @@
 #  Otherwise, a somewhat faster more lax approach is taken by certain routines.
 #
 
-CFLAGS = -DSTRICT -O -f68881 /usr/lib/f68881.il
+OPT = -O
+MACH = -DBSD
+CFLAGS = -DSTRICT $(OPT) $(MACH) -I../common -L../lib
+CC = cc
 
-INSTDIR = /usr/local/ray
+LIBDIR = /usr/local/lib/ray
 
-COMPAT = malloc.o
+INSTDIR = /usr/local/bin
 
-oconv:	dummy.o misc.o objset.o oconv.o octree.o readobj.o \
-readoct.o sphere.o fvect.o otypes.o writeoct.o o_face.o face.o plocate.o xf.o \
-clip.o cone.o o_cone.o instance.o o_instance.o bbox.o savestr.o header.o \
-mat4.o $(COMPAT)
-	cc $(CFLAGS) -o oconv oconv.o readoct.o octree.o objset.o \
-readobj.o writeoct.o fvect.o otypes.o sphere.o dummy.o misc.o o_face.o \
-face.o plocate.o clip.o cone.o o_cone.o instance.o o_instance.o mat4.o xf.o \
-bbox.o savestr.o header.o $(COMPAT) -lm
+all:	oconv getbbox
 
-install:	oconv
-	sccs check
-	install oconv $(INSTDIR)
+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 \
+plocate.o clip.o o_cone.o o_instance.o bbox.o readfargs.o \
+initotypes.o malloc.o -lrt -lm
 
-xf.o:	xf.c
-	cc $(CFLAGS) -DINVXF -c xf.c
+getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
+	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
+bbox.o init2otypes.o -lrt -lm
 
-bbox.o cone.o face.o misc.o o_cone.o o_face.o \
-o_instance.o objset.o oconv.o instance.o octree.o \
-otypes.o readobj.o readoct.o sphere.o writeoct.o:	standard.h fvect.h
+install:	oconv getbbox
+	cp oconv getbbox $(INSTDIR)
 
-o_cone.o o_face.o objset.o oconv.o octree.o \
-readoct.o sphere.o writeoct.o:	octree.h
+clean:
+	set nonomatch; rm -f oconv getbbox *.o core
 
-bbox.o cone.o face.o o_cone.o o_face.o o_instance.o objset.o oconv.o \
-instance.o otypes.o readobj.o readoct.o sphere.o writeoct.o:	object.h
+oconv.o:	oconv.c
+	$(CC) $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c oconv.c
 
-bbox.o cone.o oconv.o otypes.o \
-readobj.o readoct.o sphere.o writeoct.o:	otypes.h
+readfargs.o:	readfargs.c ../common/object.h
+	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
 
-fvect.o:	fvect.h
+bbox.o initotypes.o o_cone.o o_face.o \
+o_instance.o oconv.o sphere.o \
+writeoct.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
-bbox.o cone.o o_cone.o:	cone.h
+initotypes.o o_cone.o o_face.o oconv.o \
+sphere.o writeoct.o:	../common/octree.h
 
-bbox.o face.o o_face.o:	face.h
+bbox.o o_cone.o o_face.o o_instance.o oconv.o \
+sphere.o writeoct.o:	../common/object.h
 
-bbox.o o_instance.o instance.o:	instance.h octree.h
+bbox.o initotypes.o oconv.o \
+sphere.o writeoct.o:	../common/otypes.h
 
+bbox.o o_cone.o:	../common/cone.h
+
+bbox.o o_face.o:	../common/face.h
+
+bbox.o o_instance.o:	../common/instance.h ../common/octree.h
+
 clip.o o_face.o plocate.o:	plocate.h
+
+clip.o plocate.o:	../common/fvect.h
+
+initotypes.o init2otypes.o:	../common/otypes.h