--- ray/src/rt/Rmakefile	2003/12/31 19:38:27	2.43
+++ ray/src/rt/Rmakefile	2004/10/26 19:04:32	2.47
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.43 2003/12/31 19:38:27 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.47 2004/10/26 19:04:32 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -33,7 +33,7 @@ RCLIB = ../lib/libraycalls.a
 LIBS = -lrt $(MLIB)
 
 #
-# Device drivers for rview (see also devtable.c):
+# Device drivers for rvu (see also devtable.c):
 #
 DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
 	colortab.o
@@ -69,7 +69,7 @@ RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c init
 
 SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
 	o_face.o o_cone.o o_instance.o o_mesh.o
-SURFSRC = sphere.c source.c srcobstr.o srcsupp.c srcsamp.c virtuals.c \
+SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
 	o_face.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 \
@@ -89,12 +89,13 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 # What this makefile produces:
 #
 
-PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
+PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
 
 all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
+	cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -118,8 +119,8 @@ $(DESTDIR)/rtrace:	$(RTOBJS) $(RLIB)
 $(DESTDIR)/rpict:	$(RPOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
 
-$(DESTDIR)/rview:	$(RVOBJS) $(RLIB)
-	$(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
+$(DESTDIR)/rvu:	$(RVOBJS) $(RLIB)
+	$(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
@@ -196,7 +197,7 @@ 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 \
 raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
-srcobstr.o virtuals.o:	../common/otypes.h
+srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
 
 ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
 rtmain.o rpmain.o persist.o source.o rv3.o \
@@ -245,7 +246,8 @@ 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
 
-rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o:	../common/paths.h
+rtmain.o rpmain.o rvmain.o persist.o duphead.o \
+renderopts.o rpict.o:	../common/paths.h
 
 freeobjmem.o raycalls.o text.o:	../common/font.h