--- ray/src/rt/Rmakefile	2003/02/22 02:07:28	2.33
+++ ray/src/rt/Rmakefile	2003/06/27 06:53:22	2.37
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.33 2003/02/22 02:07:28 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.37 2003/06/27 06:53:22 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -29,6 +29,7 @@ LIBDIR = /usr/local/lib/ray
 # Library routines:
 #
 RLIB = ../lib/libradiance.a
+RCLIB = libraycalls.a
 LIBS = -lrt $(MLIB)
 
 #
@@ -67,14 +68,14 @@ RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c init
 	preload.c raytrace.c renderopts.c
 
 SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
-	o_cone.o o_instance.o
+	o_cone.o o_instance.o o_mesh.o
 SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
-	srcsamp.c o_cone.c o_instance.c
+	srcsamp.c o_cone.c o_instance.c o_mesh.c
 
 MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
-	m_mirror.o m_direct.o m_mist.o fprism.o
+	m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
 MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
-	m_mirror.c m_direct.c m_mist.c fprism.c
+	m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
 
 MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
 MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
@@ -90,11 +91,11 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS) $(SPECIAL) $(RLOBJS)
+all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
-	cp $(RLOBJS) ../lib
+	mv $(RCLIB) ../lib
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -132,6 +133,10 @@ $(RLIB):	$(ROBJS) Version.o
 	ar rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
+$(RCLIB):	$(RLOBJS)
+	ar rc $(RCLIB) $(RLOBJS)
+	-ranlib $(RCLIB)
+
 #
 # Special compiles:
 #
@@ -187,7 +192,7 @@ freeobjmem.o o_face.o srcsupp.o:	../common/face.h
 ambient.o raytrace.o rpmain.o rtmain.o \
 rtrace.o rvmain.o rv2.o rv3.o source.o:	../common/octree.h
 
-o_instance.o:	../common/instance.h ../common/octree.h
+o_instance.o:	../common/instance.h
 
 ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
 m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
@@ -199,12 +204,13 @@ rtmain.o rpmain.o persist.o source.o rv3.o \
 srcsamp.o virtuals.o:	../common/random.h
 
 ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
-m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
+m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
 mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
 raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
 source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
-rpmain.o rtmain.o rvmain.o virtuals.o:	ray.h \
-../common/standard.h ../common/octree.h \
+rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:	ray.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
+../common/rterror.h ../common/octree.h \
 ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h ../common/resolu.h
@@ -213,7 +219,9 @@ m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o
 source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
 cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
-duphead.o octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+duphead.o octree.o:	../common/standard.h ../common/rtmisc.h \
+../common/rtio.h ../common/rtmath.h \
+../common/rterror.h ../common/mat4.h ../common/fvect.h
 
 ambio.o:	../common/fvect.h
 
@@ -235,7 +243,7 @@ aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o
 p_func.o t_data.o t_func.o:	func.h
 
 preload.o:	../common/object.h ../common/face.h ../common/cone.h \
-../common/instance.h ../common/color.h data.h
+../common/instance.h ../common/mesh.h ../common/color.h data.h
 
 devcomm.o:	../common/vfork.h
 
@@ -244,3 +252,5 @@ rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o
 freeobjmem.o raycalls.o text.o:	../common/font.h
 
 raypcalls.o:	../common/selcall.h
+
+o_mesh.o:	../common/mesh.h