--- ray/src/ot/Rmakefile	1991/10/23 10:46:27	1.23
+++ ray/src/ot/Rmakefile	2003/06/27 06:53:22	2.12
@@ -1,5 +1,4 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.12 2003/06/27 06:53:22 greg Exp $
 #
 #  Compiles for octree conversion program
 #
@@ -9,40 +8,45 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN
-CFLAGS = -DSTRICT $(OPT) $(MACH) -I../common -L../lib
+MACH = -DBSD
+CFLAGS = -DSTRICT -I../common -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
 LIBDIR = /usr/local/lib/ray
 
 INSTDIR = /usr/local/bin
 
-all:	oconv getbbox
+PROGS =	oconv getbbox obj2mesh
 
-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
+all:	$(PROGS)
 
-getbbox:	getbbox.o readobj2.o bbox.o initotypes2.o
-	cc $(CFLAGS) -o getbbox getbbox.o readobj2.o \
-bbox.o initotypes2.o -lrt -lm
+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)
 
-install:	oconv getbbox
-	cp oconv getbbox $(INSTDIR)
+getbbox:	getbbox.o readobj2.o bbox.o init2otypes.o
+	$(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
+bbox.o init2otypes.o -lrt $(MLIB)
 
-clean:
-	set nonomatch; rm -f oconv getbbox *.o core
+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)
 
-oconv.o:	oconv.c
-	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c oconv.c
+install:	$(PROGS)
+	cp $(PROGS) $(INSTDIR)
 
-readfargs.o:	readfargs.c ../common/object.h
-	cc $(CFLAGS) -DMEMHOG -c readfargs.c
+clean:
+	set nonomatch; rm -f $(PROGS) *.o core
 
 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
+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
 
 initotypes.o o_cone.o o_face.o oconv.o \
 sphere.o writeoct.o:	../common/octree.h
@@ -50,15 +54,24 @@ sphere.o writeoct.o:	../common/octree.h
 bbox.o o_cone.o o_face.o o_instance.o oconv.o \
 sphere.o writeoct.o:	../common/object.h
 
-bbox.o initotypes.o oconv.o \
-sphere.o writeoct.o:	../common/otypes.h
+bbox.o initotypes.o oconv.o obj2mesh.o sphere.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
 
-bbox.o o_instance.o:	../common/instance.h ../common/octree.h
+bbox.o getbbox.o o_instance.o:	../common/instance.h \
+../common/mesh.h ../common/octree.h
 
-clip.o o_face.o plocate.o:	plocate.h
+o_face.o:	../common/plocate.h
 
-initotypes.o initotypes2.o:	../common/otypes.h
+clip.o plocate.o:	../common/fvect.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