--- ray/src/rt/Rmakefile	1990/01/30 10:51:05	1.18
+++ ray/src/rt/Rmakefile	1990/03/06 17:44:35	1.22
@@ -33,7 +33,7 @@ COMPAT = malloc.o
 DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
 	colortab.o
 DLIBS = -lX
-DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com # $(DEVDIR)/X11dev
+DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
 
 #
 # Standard object files:
@@ -94,16 +94,16 @@ $(DESTDIR)/rview:	$(RVOBJS)
 $(DESTDIR)/lookamb:	lookamb.o
 	cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
 
-$(DEVDIR)/sundev:	sundev.o devmain.o colortab.o
+$(DEVDIR)/sundev:	sundev.o devmain.o colortab.o editline.o
 	cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
--lsuntool -lsunwindow -lpixrect $(LIBS)
+editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
 
 $(DEVDIR)/sun.com:	suncom.o editline.o
 	cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
 
-$(DEVDIR)/X11dev:	x11.o x11twind.o colortab.o
-	cc $(CFLAGS) -o $(DEVDIR)/x11dev devmain.o sundev.o colortab.o \
--lX11 $(LIBS)
+$(DEVDIR)/x11dev:	x11.o x11twind.o colortab.o devmain.o editline.o
+	cc $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
+colortab.o editline.o -lX11 $(LIBS)
 
 #
 # Special compiles:
@@ -133,10 +133,10 @@ rvmain.o:	rmain.c
 # end of dispersion compiles.
 
 sundev.o:	sundev.c
-	cc $(CFLAGS) -c sundev.c
+	cc $(CFLAGS) -Dsun_init=dinit -c sundev.c
 
-devcomm.o:	devcomm.c
-	cc $(CFLAGS) -c devcomm.c
+x11.o:	x11.c
+	cc $(CFLAGS) -Dx11_init=dinit -c x11.c
 
 ambient.o:	ambient.c
 	cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
@@ -166,7 +166,8 @@ cone.o o_cone.o source.o:	cone.h
 
 data.o mx_data.o p_data.o t_data.o:	data.h
 
-aed.o devcomm.o devmain.o devtable.o sundev.o tty.o x10.o:	driver.h
+aed.o devcomm.o devmain.o devtable.o \
+editline.o sundev.o tty.o x10.o:	driver.h
 
 face.o o_face.o source.o:	face.h