--- ray/src/rt/Rmakefile	1991/04/19 15:02:50	1.42
+++ ray/src/rt/Rmakefile	1991/10/08 15:32:43	1.61
@@ -1,16 +1,15 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 #  Compiles for ray tracing programs.
 #
 
 OPT = -O -pipe
 MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
-CFLAGS = $(MACH) $(OPT)
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 CC = cc
 LINT = lint
 LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
--DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF 
+-DINCHAN -DRCONST -DREDEFW -DBIGLIB
 
 #
 # The following are user-definable:
@@ -28,15 +27,14 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = -lm
-COMPAT = malloc.o
+LIBS = -lrt -lm
 
 #
 # Device drivers for rview (see also devtable.c):
 #
 DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
 	colortab.o
-DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
+DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
 	colortab.c
 DLIBS = -lX11
 
@@ -47,42 +45,38 @@ DLIBS = -lX11
 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)
+RPOBJS = rpmain.o rpict.o $(ROBJS)
+RPSRC = rmain.c rpict.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)
+RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
+RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
 
-ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
-	$(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
-RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
-	$(MODSRC) $(SUPPSRC) $(MISCSRC)
+ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
+	$(MODOBJS) $(SUPPOBJS)
+RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
+	$(MODSRC) $(SUPPSRC)
 
-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 = initotypes.o raytrace.o ambient.o ambcomp.o
+RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
 
-RAYOBJS = raytrace.o ambient.o
-RAYSRC = raytrace.c ambient.c
+SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
+	o_instance.o
+SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
+		o_cone.c o_instance.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 m_brdf.o m_mirror.o \
+	m_direct.o
+MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
+	m_direct.c
 
-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
+SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
+	malloc.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
+	malloc.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:
 #
@@ -91,8 +85,10 @@ PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
 
 all:	$(PROGS)
 
-install:	$(PROGS)
+install:	$(PROGS) rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
+	rm -f $(LIBDIR)/rayinit.cal
+	cp rayinit.cal $(LIBDIR)
 
 sun:	$(DEVDIR)/sun $(DEVDIR)/sun.com
 
@@ -100,6 +96,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+tiff:	
+
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
 
@@ -153,12 +151,18 @@ rvmain.o:	rmain.c
 	$(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
 	mv rmain.o rvmain.o
 
+readfargs.o:	readfargs.c ../common/object.h
+	$(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
+
+malloc.o:	malloc.c
+	$(CC) $(CFLAGS) -DMCOMP -c malloc.c
+
 #
-# Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
+# Uncomment the following to model dispersion:
 #
-#dielectric.o:	dielectric.c source.h
-#	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
-#
+dielectric.o:	dielectric.c source.h
+	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
+
 # end of dispersion compiles.
 
 devcomm.o:	devcomm.c
@@ -176,18 +180,12 @@ aed.o:	aed.c
 ambient.o:	ambient.c
 	$(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
 
-calexpr.o:	calexpr.c calcomp.h
+calexpr.o:	calexpr.c ../common/calcomp.h
 	$(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
 
-caldefn.o:	caldefn.c calcomp.h
+caldefn.o:	caldefn.c ../common/calcomp.h
 	$(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
 
-calfunc.o:	calfunc.c calcomp.h
-	$(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
-
-xf.o:	xf.c
-	$(CC) $(CFLAGS) -DINVXF -c xf.c
-
 nwsdev.o:	nwsdev.c nwsdev.h newsconstants.h
 	$(CC) $(CFLAGS) -c nwsdev.c
 
@@ -198,56 +196,53 @@ nwsdev.h:	nwsdev.cps newsconstants.h
 # Include dependencies:
 #
 
-caldefn.o calexpr.o calfunc.o:	calcomp.h
+aed.o colortab.o data.o devcomm.o \
+devmain.o lookamb.o rview.o sundev.o x10.o x11.o:	../common/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
+o_cone.o srcsupp.o:	../common/cone.h
 
-cone.o o_cone.o source.o:	cone.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
 
-face.o o_face.o source.o:	face.h
+o_face.o srcsupp.o:	../common/face.h
 
-fvect.o:	fvect.h
+ambient.o raytrace.o rpmain.o rtmain.o \
+rtrace.o rvmain.o rv2.o rv3.o source.o:	../common/octree.h
 
-cone.o face.o objset.o otypes.o readobj.o readoct.o:	object.h
+o_instance.o:	../common/instance.h ../common/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
+ambient.o dielectric.o func.o initotypes.o m_brdf.o \
+normal.o o_cone.o text.o raytrace.o rtrace.o \
+rv2.o source.o srcsupp.o virtuals.o sphere.o:	../common/otypes.h
 
-o_instance.o instance.o:	instance.h octree.h
+ambient.o ambcomp.o rpict.o rv3.o source.o:	../common/random.h
 
-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 \
+ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.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 mat4.h fvect.h object.h color.h
+rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
+t_data.o t_func.o:	ray.h ../common/standard.h ../common/mat4.h \
+../common/fvect.h ../common/object.h ../common/color.h
 
-rv2.o rv3.o rview.o:	rpaint.h driver.h view.h
+rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h
 
-source.o:	source.h
+mirror.o source.o srcsupp.o virtuals.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
+cone.o data.o devcomm.o initotypes.o \
+octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
-mat4.o:		mat4.h fvect.h
+initotypes.o raytrace.o:	otspecial.h
 
 sundev.o:	suntools.icon
 
-image.o rpmain.o rtmain.o rvmain.o rpict.o:	view.h
+rpmain.o rtmain.o rvmain.o rpict.o:	../common/view.h
 
 x10.o xtwind.o:	xtwind.h
 
 x11.o x11twind.o: x11twind.h
 
 x11.o:	x11icon.h
+
+ambient.o ambcomp.o lookamb.o:	ambient.h