--- ray/src/rt/Rmakefile	1990/09/22 10:52:19	1.31
+++ ray/src/rt/Rmakefile	1990/12/13 11:07:28	1.37
@@ -8,6 +8,9 @@ OPT = -O -pipe
 MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
 CFLAGS = $(MACH) $(OPT)
 CC = cc
+LINT = lint
+LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
+-DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF 
 
 #
 # The following are user-definable:
@@ -19,51 +22,67 @@ INSTALL = cp
 #
 # The following paths must exist and be relative to root:
 #
-DEVDIR = $(INSTDIR)
+DEVDIR = $(INSTDIR)/dev
 LIBDIR = /usr/local/lib/ray
 
 #
 # Library routines:
 #
 LIBS = -lm
-COMPAT =
+COMPAT = malloc.o
 
 #
 # Device drivers for rview (see also devtable.c):
 #
 DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
 	colortab.o nwsdev.o
+DSRC = devtable.c devcomm.c aed.c tty.c editline.c x10.c xtwind.c \
+	colortab.c nwsdev.c
 DLIBS = -lX -lcps
-DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
+DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
 
 #
 # Standard object files:
 #
 
 RTOBJS = rtmain.o rtrace.o $(ROBJS)
+RTSRC = rmain.c rtrace.c $(RSRC)
 
 RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
+RPSRC = rmain.c rpict.c image.c $(RSRC)
 
 RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
+RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
 
 ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
+RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
+	$(MODSRC) $(SUPPSRC) $(MISCSRC)
 
-OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o
+OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
+OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
 
 RAYOBJS = raytrace.o ambient.o
+RAYSRC = raytrace.c ambient.c
 
 SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
 		o_cone.o o_instance.o instance.o
+SURFSRC = face.c sphere.c source.c o_face.c cone.c \
+		o_cone.c o_instance.c instance.c
 
-MATOBJS = normal.o dielectric.o m_clip.o glass.o
+MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
+MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c
 
 MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
+MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
 
 SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
 
 MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
 		color.o resolu.o
+MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
+		color.c resolu.c
 
 #
 # What this makefile produces:
@@ -79,6 +98,9 @@ install:	all
 clean:
 	rm -f *.o core
 
+lint:	$(RVSRC)
+	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
+
 #
 # Links:
 #
@@ -95,15 +117,15 @@ $(DESTDIR)/rview:	$(RVOBJS)
 $(DESTDIR)/lookamb:	lookamb.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
 
-$(DEVDIR)/sundev:	sundev.o devmain.o colortab.o editline.o
-	$(CC) $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
+$(DEVDIR)/sun:	sundev.o devmain.o colortab.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun 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
+	$(CC) $(CFLAGS) -s -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 \
+$(DEVDIR)/x11:	x11.o x11twind.o colortab.o devmain.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/x11 x11.o x11twind.o devmain.o \
 colortab.o editline.o -lX11 $(LIBS)
 
 #
@@ -130,8 +152,11 @@ rvmain.o:	rmain.c
 #
 # end of dispersion compiles.
 
+devcomm.o:	devcomm.c
+	$(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
+
 sundev.o:	sundev.c
-	$(CC) $(CFLAGS) -Dsun_init=dinit -c sundev.c
+	$(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
 
 x11.o:	x11.c
 	$(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
@@ -168,7 +193,7 @@ devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x1
 
 cone.o o_cone.o source.o:	cone.h
 
-data.o mx_data.o p_data.o t_data.o:	data.h
+data.o m_brdf.o mx_data.o p_data.o t_data.o:	data.h
 
 aed.o devcomm.o devmain.o devtable.o \
 editline.o nwsdev.o sundev.o tty.o x10.o x11.o:	driver.h
@@ -184,14 +209,14 @@ rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source
 
 o_instance.o instance.o:	instance.h octree.h
 
-ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
-otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
+ambient.o cone.o dielectric.o func.o initotypes.o m_brdf.o normal.o o_cone.o \
+objset.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 m_clip.o \
-mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
+m_brdf.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 rpmain.o rtmain.o rvmain.o rpict.o \
 rtrace.o rv2.o rv3.o source.o \
 sphere.o t_data.o t_func.o:	ray.h standard.h fvect.h object.h color.h
@@ -200,8 +225,8 @@ rv2.o rv3.o rview.o:	rpaint.h driver.h view.h
 
 source.o:	source.h
 
-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
+cone.o data.o devcomm.o face.o image.o initotypes.o misc.o objset.o \
+octree.o otypes.o readobj.o readoct.o rview.o:	standard.h fvect.h
 
 sundev.o:	suntools.icon