--- ray/src/ot/Rmakefile	1995/04/03 16:46:46	2.6
+++ 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
 #
@@ -10,7 +9,7 @@
 
 OPT = -O
 MACH = -DBSD
-CFLAGS = -DSTRICT $(OPT) $(MACH) -I../common -L../lib
+CFLAGS = -DSTRICT -I../common -L../lib $(OPT) $(MACH)
 CC = cc
 MLIB = -lm
 
@@ -18,29 +17,33 @@ LIBDIR = /usr/local/lib/ray
 
 INSTDIR = /usr/local/bin
 
-all:	oconv getbbox
+PROGS =	oconv getbbox obj2mesh
 
+all:	$(PROGS)
+
 oconv:	oconv.o sphere.o writeoct.o o_face.o \
-o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.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 readfargs.o \
-initotypes.o malloc.o -lrt $(MLIB)
+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)
 
-install:	oconv getbbox
-	cp oconv getbbox $(INSTDIR)
+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 getbbox *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
-readfargs.o:	readfargs.c ../common/object.h
-	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.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
 
 initotypes.o o_cone.o o_face.o oconv.o \
@@ -49,8 +52,7 @@ 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
 
@@ -58,10 +60,16 @@ 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
 
 o_face.o:	../common/plocate.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