--- ray/src/ot/Rmakefile	1990/01/18 23:59:28	1.5
+++ ray/src/ot/Rmakefile	1995/04/03 16:46:46	2.6
@@ -9,49 +9,59 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/f68881.il
-CFLAGS = -DSTRICT $(OPT) $(MACH)
+MACH = -DBSD
+CFLAGS = -DSTRICT $(OPT) $(MACH) -I../common -L../lib
+CC = cc
+MLIB = -lm
 
-INSTDIR = /usr/local/ray
+LIBDIR = /usr/local/lib/ray
 
-INSTALL = install
+INSTDIR = /usr/local/bin
 
-COMPAT = malloc.o
+all:	oconv getbbox
 
-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 fgetline.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 fgetline.o $(COMPAT) -lm
+oconv:	oconv.o sphere.o writeoct.o o_face.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 \
+o_cone.o o_instance.o bbox.o readfargs.o \
+initotypes.o malloc.o -lrt $(MLIB)
 
-install:	oconv
-	$(INSTALL) oconv $(INSTDIR)
+getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
+	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
+bbox.o init2otypes.o -lrt $(MLIB)
 
-xf.o:	xf.c
-	cc $(CFLAGS) -DINVXF -c xf.c
+install:	oconv getbbox
+	cp oconv getbbox $(INSTDIR)
 
-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
+clean:
+	set nonomatch; rm -f oconv getbbox *.o core
 
-o_cone.o o_face.o objset.o oconv.o octree.o \
-readoct.o sphere.o writeoct.o:	octree.h
+readfargs.o:	readfargs.c ../common/object.h
+	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
 
-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
+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 oconv.o otypes.o \
-readobj.o readoct.o sphere.o writeoct.o:	otypes.h
+initotypes.o o_cone.o o_face.o oconv.o \
+sphere.o writeoct.o:	../common/octree.h
 
-fvect.o:	fvect.h
+bbox.o o_cone.o o_face.o o_instance.o oconv.o \
+sphere.o writeoct.o:	../common/object.h
 
-bbox.o cone.o o_cone.o:	cone.h
+bbox.o initotypes.o oconv.o \
+sphere.o writeoct.o:	../common/otypes.h
 
-bbox.o face.o o_face.o:	face.h
+oconv.o:	../common/paths.h
 
-bbox.o o_instance.o instance.o:	instance.h octree.h
+bbox.o o_cone.o:	../common/cone.h
 
-clip.o o_face.o plocate.o:	plocate.h
+bbox.o o_face.o:	../common/face.h
+
+bbox.o o_instance.o:	../common/instance.h ../common/octree.h
+
+o_face.o:	../common/plocate.h
+
+clip.o plocate.o:	../common/fvect.h
+
+initotypes.o init2otypes.o:	../common/otypes.h