--- ray/src/rt/Rmakefile	1991/03/07 15:12:09	1.39
+++ ray/src/rt/Rmakefile	1991/05/01 11:17:03	1.44
@@ -98,11 +98,10 @@ sun:	$(DEVDIR)/sun $(DEVDIR)/sun.com
 
 x10:	$(DEVDIR)/x10
 
-aed:
-	@echo
+aed:	$(DEVDIR)/aed
 
 clean:
-	rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
 lint:	$(RVSRC)
 	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
@@ -134,6 +133,10 @@ $(DEVDIR)/x10:	x10.o xtwind.o colortab.o devmain.o edi
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
 colortab.o editline.o -lX $(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)
+
 #
 # Special compiles:
 #
@@ -167,6 +170,9 @@ sundev.o:	sundev.c
 x10.o:	x10.c
 	$(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
 
+aed.o:	aed.c
+	$(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
+
 ambient.o:	ambient.c
 	$(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
 
@@ -174,7 +180,7 @@ calexpr.o:	calexpr.c calcomp.h
 	$(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
 
 caldefn.o:	caldefn.c calcomp.h
-	$(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
+	$(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
 
 calfunc.o:	calfunc.c calcomp.h
 	$(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
@@ -234,6 +240,8 @@ source.o:	source.h
 cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
 octree.o otypes.o readobj.o readoct.o rview.o:	standard.h mat4.h fvect.h
 
+initotypes.o raytrace.o:	otspecial.h
+
 mat4.o:		mat4.h fvect.h
 
 sundev.o:	suntools.icon
@@ -243,3 +251,5 @@ image.o rpmain.o rtmain.o rvmain.o rpict.o:	view.h
 x10.o xtwind.o:	xtwind.h
 
 x11.o x11twind.o: x11twind.h
+
+x11.o:	x11icon.h