--- ray/src/rt/Rmakefile	2003/03/11 19:29:05	2.35
+++ ray/src/rt/Rmakefile	2003/11/11 16:24:06	2.41
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.35 2003/03/11 19:29:05 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.41 2003/11/11 16:24:06 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -29,6 +29,7 @@ LIBDIR = /usr/local/lib/ray
 # Library routines:
 #
 RLIB = ../lib/libradiance.a
+RCLIB = ../lib/libraycalls.a
 LIBS = -lrt $(MLIB)
 
 #
@@ -90,11 +91,10 @@ 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
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -132,6 +132,10 @@ $(RLIB):	$(ROBJS) Version.o
 	ar rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
+$(RCLIB):	$(RLOBJS)
+	ar rc $(RCLIB) $(RLOBJS)
+	-ranlib $(RCLIB)
+
 #
 # Special compiles:
 #
@@ -204,7 +208,8 @@ mx_func.o normal.o o_cone.o o_face.o o_instance.o p_da
 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 m_alias.o:	ray.h \
-../common/standard.h ../common/octree.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 +218,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
 
@@ -232,13 +239,11 @@ data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
 rv2.o:	../common/resolu.h
 
 aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
-p_func.o t_data.o t_func.o:	func.h
+p_func.o t_data.o t_func.o:	func.h ../common/calcomp.h
 
 preload.o:	../common/object.h ../common/face.h ../common/cone.h \
 ../common/instance.h ../common/mesh.h ../common/color.h data.h
 
-devcomm.o:	../common/vfork.h
-
 rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o:	../common/paths.h
 
 freeobjmem.o raycalls.o text.o:	../common/font.h
@@ -246,3 +251,5 @@ freeobjmem.o raycalls.o text.o:	../common/font.h
 raypcalls.o:	../common/selcall.h
 
 o_mesh.o:	../common/mesh.h
+
+noise3.o:	../common/calcomp.h