--- ray/src/rt/Rmakefile	1991/10/09 12:27:50	1.63
+++ ray/src/rt/Rmakefile	1996/06/20 16:57:07	2.24
@@ -1,21 +1,23 @@
 #
 # SCCSid "$SunId$ LBL"
-#  Compiles for ray tracing programs.
+# Compiles for ray tracing programs.
 #
 
-OPT = -O -pipe
-MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
+OPT = -O
+MACH = -DBSD
 CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+SPECIAL = aed
 CC = cc
+MLIB = -lm
 LINT = lint
-LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
--DINCHAN -DRCONST -DREDEFW -DBIGLIB
+LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
+-DINCHAN -DRCONST -DREDEFW
 
 #
 # The following are user-definable:
 #
 DESTDIR = .
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 INSTALL = cp
 
 #
@@ -27,7 +29,7 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = -lrt -lm
+LIBS = -lrt $(MLIB)
 
 #
 # Device drivers for rview (see also devtable.c):
@@ -42,40 +44,42 @@ DLIBS = -lX11
 # Standard object files:
 #
 
-RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
-RTSRC = rmain.c rtrace.c $(RSRC) Version.c
+RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
+RTSRC = rmain.c rtrace.c duphead.c persist.c preload.c $(RSRC) Version.c
 
-RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
-RPSRC = rmain.c rpict.c $(RSRC) Version.c
+RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o preload.o $(ROBJS) \
+Version.o
+RPSRC = rmain.c rpict.c srcdraw.c duphead.c persist.c preload.c $(RSRC) \
+Version.c
 
-RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
-RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
+RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
+RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
 
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS)
 RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
 	$(MODSRC) $(SUPPSRC)
 
-RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
-RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
+RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
+RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
 
-SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
-	o_instance.o
+SURFOBJS = source.o sphere.o srcsupp.o srcsamp.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
+		srcsamp.c o_cone.c o_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 = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
+	m_mirror.o m_direct.o m_mist.o fprism.o
+MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
+	m_mirror.c m_direct.c m_mist.c fprism.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 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
+SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \
+	readfargs.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
+	readfargs.c
 
 HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
@@ -85,9 +89,9 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS)
+all:	$(PROGS) $(SPECIAL)
 
-install:	$(PROGS) rayinit.cal
+install:	$(PROGS) $(SPECIAL) rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
@@ -98,6 +102,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+sgi:	$(DEVDIR)/news
+
 tiff:	
 
 clean:
@@ -119,8 +125,8 @@ $(DESTDIR)/rpict:	$(RPOBJS)
 $(DESTDIR)/rview:	$(RVOBJS)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
 
-$(DESTDIR)/lookamb:	lookamb.o
-	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
+$(DESTDIR)/lookamb:	lookamb.o ambio.o
+	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
 
 $(DEVDIR)/sun:	sundev.o devmain.o colortab.o editline.o
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
@@ -137,20 +143,24 @@ $(DEVDIR)/aed:	aed.o colortab.o tty.o devmain.o editli
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
 devmain.o tty.o editline.o $(LIBS)
 
+$(DEVDIR)/news: nwsdev.o devmain.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
+-lcps $(LIBS)
+
 #
 # Special compiles:
 #
 
 rtmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c
 	mv rmain.o rtmain.o
 
 rpmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c
 	mv rmain.o rpmain.o
 
 rvmain.o:	rmain.c
-	$(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
+	$(CC) $(CFLAGS) -DRVIEW -c rmain.c
 	mv rmain.o rvmain.o
 
 readfargs.o:	readfargs.c ../common/object.h
@@ -179,9 +189,6 @@ x10.o:	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
-
 calexpr.o:	calexpr.c ../common/calcomp.h
 	$(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
 
@@ -189,7 +196,7 @@ caldefn.o:	caldefn.c ../common/calcomp.h
 	$(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
 
 nwsdev.o:	nwsdev.c nwsdev.h newsconstants.h
-	$(CC) $(CFLAGS) -c nwsdev.c
+	$(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
 
 nwsdev.h:	nwsdev.cps newsconstants.h
 	cps nwsdev.cps
@@ -206,7 +213,7 @@ Version.c:	VERSION $(RSRC) $(HEADERS)
 # Include dependencies:
 #
 
-aed.o colortab.o data.o devcomm.o \
+aed.o ambio.o colortab.o data.o devcomm.o \
 devmain.o lookamb.o rview.o sundev.o x10.o x11.o:	../common/color.h
 
 o_cone.o srcsupp.o:	../common/cone.h
@@ -223,31 +230,37 @@ rtrace.o rvmain.o rv2.o rv3.o source.o:	../common/octr
 
 o_instance.o:	../common/instance.h ../common/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
+ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
+m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
+raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
+virtuals.o:	../common/otypes.h
 
-ambient.o ambcomp.o rpict.o rv3.o source.o:	../common/random.h
+ambient.o ambcomp.o aniso.o normal.o rpict.o \
+source.o rv3.o srcsamp.o virtuals.o:	../common/random.h
 
-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 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
+ambcomp.o ambient.o aniso.o dielectric.o func.o glass.o glazing.o \
+m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o mx_func.o \
+normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o raytrace.o \
+rmain.o rpict.o rtrace.o rv2.o rv3.o rview.o source.o sphere.o srcdraw.o \
+srcsamp.o srcsupp.o t_data.o t_func.o text.o \
+virtuals.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 ../common/view.h
 
-mirror.o source.o srcsupp.o virtuals.o:	source.h
+m_direct.o m_mirror.o m_mist.o dielectric.o \
+source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
-cone.o data.o devcomm.o initotypes.o \
-octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o \
+duphead.o octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
+ambio.o:	../common/fvect.h
+
 initotypes.o raytrace.o:	otspecial.h
 
 sundev.o:	suntools.icon
 
-rpmain.o rtmain.o rvmain.o rpict.o:	../common/view.h
+rpmain.o rtmain.o rvmain.o rpict.o srcdraw.o:	../common/view.h
 
 x10.o xtwind.o:	xtwind.h
 
@@ -255,4 +268,15 @@ x11.o x11twind.o: x11twind.h
 
 x11.o:	x11icon.h
 
-ambient.o ambcomp.o lookamb.o:	ambient.h
+ambient.o ambcomp.o ambio.o lookamb.o:	ambient.h
+
+data.o rmain.o rpict.o rtrace.o rv2.o:	../common/resolu.h
+
+aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
+p_func.o t_data.o t_func.o:	func.h
+
+freeobjmem.o:	../common/object.h
+
+devcomm.o:	../common/vfork.h
+
+rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o:	../common/paths.h