--- ray/src/rt/Rmakefile	1989/02/02 10:41:12	1.1
+++ ray/src/rt/Rmakefile	1990/03/06 17:44:35	1.22
@@ -4,7 +4,9 @@
 #  Compiles for ray tracing programs.
 #
 
-CFLAGS = -DBSD -O -DIEEE -f68881 /usr/lib/f68881.il
+OPT = -O
+MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
+CFLAGS = $(MACH) $(OPT)
 
 #
 # The following are user-definable:
@@ -16,20 +18,22 @@ INSTALL = cp
 #
 # The following paths must exist and be relative to root:
 #
-DEVDIR = $(LIBDIR)/lib
+DEVDIR = $(INSTDIR)
 LIBDIR = /usr/local/lib/ray
 
 #
-# Broken library routines:
+# Library routines:
 #
+LIBS = -lm
 COMPAT = malloc.o
 
 #
 # Device drivers for rview (see also devtable.c):
 #
-DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o
+DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
+	colortab.o
 DLIBS = -lX
-DRIVERS = $(DEVDIR)/sun.dev $(DEVDIR)/sun.com
+DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
 
 #
 # Standard object files:
@@ -53,11 +57,12 @@ SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
 
 MATOBJS = normal.o dielectric.o m_clip.o glass.o
 
-MODOBJS = p_func.o t_func.o p_data.o text.o mx_func.o mx_data.o
+MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
 
 SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
 
-MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o ealloc.o
+MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
+		fgetline.o ealloc.o
 
 #
 # What this makefile produces:
@@ -68,7 +73,6 @@ PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
 all:	$(PROGS) $(DRIVERS)
 
 install:	all
-	sccs check
 	$(INSTALL) $(PROGS) $(INSTDIR)
 
 clean:
@@ -79,24 +83,28 @@ clean:
 #
 
 $(DESTDIR)/rtrace:	$(RTOBJS)
-	cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) -lm
+	cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
 
 $(DESTDIR)/rpict:	$(RPOBJS)
-	cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) -lm
+	cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
 
 $(DESTDIR)/rview:	$(RVOBJS)
-	cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) -lm
+	cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o
 	cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
 
-$(DEVDIR)/sun.dev:	sundev.o
-	cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o \
--lsuntool -lsunwindow -lpixrect -lm
+$(DEVDIR)/sundev:	sundev.o devmain.o colortab.o editline.o
+	cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
+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 devmain.o editline.o
+	cc $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
+colortab.o editline.o -lX11 $(LIBS)
+
 #
 # Special compiles:
 #
@@ -125,10 +133,10 @@ rvmain.o:	rmain.c
 # end of dispersion compiles.
 
 sundev.o:	sundev.c
-	cc $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -c sundev.c
+	cc $(CFLAGS) -Dsun_init=dinit -c sundev.c
 
-devcomm.o:	devcomm.c
-	cc $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -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
@@ -151,13 +159,15 @@ xf.o:	xf.c
 
 caldefn.o calexpr.o calfunc.o:	calcomp.h
 
-aed.o color.o data.o devcomm.o lookamb.o rview.o sundev.o x10.o:	color.h
+aed.o color.o colortab.o data.o devcomm.o \
+devmain.o lookamb.o rview.o sundev.o x10.o:	color.h
 
 cone.o o_cone.o source.o:	cone.h
 
-data.o mx_data.o p_data.o:	data.h
+data.o mx_data.o p_data.o t_data.o:	data.h
 
-aed.o devcomm.o devtable.o sun.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
 
@@ -165,27 +175,28 @@ fvect.o:	fvect.h
 
 cone.o face.o objset.o otypes.o readobj.o readoct.o:	object.h
 
-ambient.o objset.o octree.o raytrace.o readoct.o rmain.o rv2.o:	octree.h
+ambient.o objset.o octree.o raytrace.o \
+readoct.o rmain.o rv2.o rv3.o source.o:	octree.h
 
 o_instance.o instance.o:	instance.h octree.h
 
-cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
+ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
 text.o raytrace.o readobj.o readoct.o rtrace.o \
 rv2.o source.o sphere.o:	otypes.h
 
 ambient.o rpict.o rv3.o source.o:	random.h
 
-ambient.o dielectric.o func.o glass.o image.o m_clip.o \
+ambient.o dielectric.o func.o glass.o m_clip.o \
 mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
 p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
 rtrace.o rv2.o rv3.o source.o \
-sphere.o t_func.o:	ray.h standard.h fvect.h object.h color.h
+sphere.o t_data.o t_func.o:	ray.h standard.h fvect.h object.h color.h
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h view.h
 
-dielectric.o normal.o source.o:	source.h
+source.o:	source.h
 
-cone.o data.o face.o misc.o objset.o octree.o otypes.o \
+cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
 readobj.o readoct.o rview.o:	standard.h fvect.h
 
 sundev.o:	suntools.icon
@@ -193,3 +204,5 @@ sundev.o:	suntools.icon
 image.o rmain.o rpict.o:	view.h
 
 x10.o xtwind.o:	xtwind.h
+
+x11.o x11twind.o: x11twind.h