--- ray/src/rt/Rmakefile	2004/01/01 19:31:46	2.44
+++ ray/src/rt/Rmakefile	2004/11/05 03:31:38	2.49
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.44 2004/01/01 19:31:46 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.49 2004/11/05 03:31:38 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -6,7 +6,7 @@
 OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
-SPECIAL = aed
+SPECIAL = 
 CC = cc
 MLIB = -lm
 LINT = lint
@@ -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 \
@@ -99,8 +99,6 @@ install:	all rayinit.cal
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
-aed:	$(DEVDIR)/aed
-
 ogl:	
 
 clean:
@@ -125,10 +123,6 @@ $(DESTDIR)/rvu:	$(RVOBJS) $(RLIB)
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
-$(DEVDIR)/aed:	aed.o colortab.o tty.o devmain.o editline.o
-	$(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
-devmain.o tty.o editline.o $(LIBS)
-
 $(RLIB):	$(ROBJS) Version.o
 	ar rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
@@ -161,9 +155,6 @@ dielectric.o:	dielectric.c source.h
 devcomm.o:	devcomm.c
 	$(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
 
-aed.o:	aed.c
-	$(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
-
 #
 # Version module:
 #
@@ -176,7 +167,7 @@ Version.c:	VERSION $(RSRC) $(HEADERS)
 # Include dependencies:
 #
 
-aed.o ambio.o colortab.o data.o devcomm.o \
+ambio.o colortab.o data.o devcomm.o \
 devmain.o lookamb.o rview.o x11.o:	../common/color.h
 
 freeobjmem.o o_cone.o srcsupp.o:	../common/cone.h
@@ -184,8 +175,8 @@ freeobjmem.o o_cone.o srcsupp.o:	../common/cone.h
 data.o freeobjmem.o m_brdf.o mx_data.o \
 p_data.o raycalls.o t_data.o:	data.h
 
-aed.o devcomm.o devmain.o devtable.o \
-editline.o tty.o x11.o:	driver.h
+devcomm.o devmain.o devtable.o \
+editline.o x11.o:	driver.h
 
 freeobjmem.o o_face.o srcsupp.o:	../common/face.h
 
@@ -197,7 +188,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 \
@@ -210,7 +201,7 @@ raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2
 source.o sphere.o srcdraw.o srcobstr.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/rtmisc.h ../common/rtio.h ../common/rtmath.h \
-../common/rterror.h ../common/octree.h \
+../common/rterror.h ../common/octree.h ../common/tifftypes.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
@@ -221,7 +212,7 @@ srcobstr.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/rtmisc.h \
-../common/rtio.h ../common/rtmath.h \
+../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \
 ../common/rterror.h ../common/mat4.h ../common/fvect.h
 
 ambio.o:	../common/fvect.h
@@ -246,7 +237,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