--- ray/src/rt/Rmakefile	1990/07/18 21:43:42	1.27
+++ ray/src/rt/Rmakefile	1991/05/01 11:17:03	1.44
@@ -5,21 +5,24 @@
 #
 
 OPT = -O -pipe
-MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
+MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
 CFLAGS = $(MACH) $(OPT)
 CC = cc
+LINT = lint
+LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
+-DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF 
 
 #
 # The following are user-definable:
 #
 DESTDIR = .
-INSTDIR = /usr/local/ray
+INSTDIR = /lumen/lumen/ray/bin.sun3
 INSTALL = cp
 
 #
 # The following paths must exist and be relative to root:
 #
-DEVDIR = $(INSTDIR)
+DEVDIR = $(INSTDIR)/dev
 LIBDIR = /usr/local/lib/ray
 
 #
@@ -31,39 +34,54 @@ 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
-DLIBS = -lX -lcps
-DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
+DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
+	colortab.o
+DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
+	colortab.c
+DLIBS = -lX11
 
 #
 # 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 color.o header.o mat4.o xf.o fvect.o savestr.o \
-		fgetline.o ealloc.o
+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:
@@ -71,14 +89,23 @@ MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS) $(DRIVERS)
+all:	$(PROGS)
 
-install:	all
+install:	$(PROGS)
 	$(INSTALL) $(PROGS) $(INSTDIR)
 
+sun:	$(DEVDIR)/sun $(DEVDIR)/sun.com
+
+x10:	$(DEVDIR)/x10
+
+aed:	$(DEVDIR)/aed
+
 clean:
-	rm -f *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
+lint:	$(RVSRC)
+	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
+
 #
 # Links:
 #
@@ -95,17 +122,21 @@ $(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 \
-colortab.o editline.o -lX11 $(LIBS)
+$(DEVDIR)/x10:	x10.o xtwind.o colortab.o devmain.o editline.o
+	$(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:
 #
@@ -123,22 +154,25 @@ rvmain.o:	rmain.c
 	mv rmain.o rvmain.o
 
 #
-# Uncomment the following to model dispersion:
+# Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
 #
 #dielectric.o:	dielectric.c source.h
 #	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
 #
-#color.o:	color.c color.h
-#	$(CC) $(CFLAGS) -DSPEC_RGB -c color.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
+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
 
@@ -146,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
@@ -166,12 +200,12 @@ nwsdev.h:	nwsdev.cps newsconstants.h
 
 caldefn.o calexpr.o calfunc.o:	calcomp.h
 
-aed.o color.o colortab.o data.o devcomm.o \
-devmain.o lookamb.o rview.o sundev.o x10.o x11.o:	color.h
+aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
+devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:	color.h
 
 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
@@ -182,30 +216,34 @@ 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 rpmain.o rtmain.o rvmain.o rv2.o rv3.o source.o:	octree.h
+ambient.o objset.o octree.o raytrace.o readoct.o \
+rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:	octree.h
 
 o_instance.o instance.o:	instance.h octree.h
 
-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 \
+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
+rtrace.o rv2.o rv3.o source.o sphere.o \
+t_data.o t_func.o:	ray.h standard.h mat4.h fvect.h object.h color.h
 
 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 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
 
 image.o rpmain.o rtmain.o rvmain.o rpict.o:	view.h
@@ -213,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