--- ray/src/ot/Rmakefile	1991/04/11 09:21:24	1.11
+++ ray/src/ot/Rmakefile	2003/03/15 17:55:48	2.11
@@ -1,5 +1,4 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.11 2003/03/15 17:55:48 greg Exp $
 #
 #  Compiles for octree conversion program
 #
@@ -9,52 +8,68 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/libm.il
-CFLAGS = -DSTRICT $(OPT) $(MACH)
+MACH = -DBSD
+CFLAGS = -DSTRICT -I../common -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+LIBDIR = /usr/local/lib/ray
 
-COMPAT = malloc.o
+INSTDIR = /usr/local/bin
 
-oconv:	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 initotypes.o $(COMPAT)
-	cc $(CFLAGS) -o oconv oconv.o readoct.o octree.o objset.o \
-readobj.o writeoct.o fvect.o otypes.o sphere.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 initotypes.o $(COMPAT) -lm
+PROGS =	oconv getbbox obj2mesh
 
-install:	oconv
-	cp oconv $(INSTDIR)
+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)
+
+getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
+	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
+bbox.o init2otypes.o -lrt $(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)
+
+install:	$(PROGS)
+	cp $(PROGS) $(INSTDIR)
+
 clean:
-	set nonomatch; rm -f oconv *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
-xf.o:	xf.c
-	cc $(CFLAGS) -DINVXF -c xf.c
+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
 
-bbox.o cone.o face.o initotypes.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 xf.o:	standard.h mat4.h fvect.h
+initotypes.o o_cone.o o_face.o oconv.o \
+sphere.o writeoct.o:	../common/octree.h
 
-initotypes.o o_cone.o o_face.o objset.o oconv.o octree.o \
-readoct.o sphere.o writeoct.o:	octree.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 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 oconv.o obj2mesh.o sphere.o:	../common/otypes.h
 
-bbox.o cone.o initotypes.o objset.o oconv.o otypes.o \
-readobj.o readoct.o sphere.o writeoct.o:	otypes.h
+oconv.o:	../common/paths.h
 
-mat4.o:		mat4.h fvect.h
+bbox.o o_cone.o:	../common/cone.h
 
-fvect.o:	fvect.h
+bbox.o o_face.o:	../common/face.h
 
-bbox.o cone.o o_cone.o:	cone.h
+bbox.o getbbox.o o_instance.o:	../common/instance.h \
+../common/mesh.h ../common/octree.h
 
-bbox.o face.o o_face.o:	face.h
+o_face.o:	../common/plocate.h
 
-bbox.o o_instance.o instance.o:	instance.h octree.h
+clip.o plocate.o:	../common/fvect.h
 
-clip.o o_face.o plocate.o:	plocate.h
+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