--- ray/src/rt/Rmakefile	1990/12/13 11:07:28	1.37
+++ ray/src/rt/Rmakefile	1996/04/11 15:59:14	2.22
@@ -1,22 +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/f68881.il
-CFLAGS = $(MACH) $(OPT)
+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 -DINVXF 
+LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
+-DINCHAN -DRCONST -DREDEFW
 
 #
 # The following are user-definable:
 #
 DESTDIR = .
-INSTDIR = /usr/local/ray
+INSTDIR = /usr/local/bin
 INSTALL = cp
 
 #
@@ -28,61 +29,59 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = -lm
-COMPAT = malloc.o
+LIBS = -lrt $(MLIB)
 
 #
 # 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)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
+DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
+	colortab.o
+DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
+	colortab.c
+DLIBS = -lX11
 
 #
 # Standard object files:
 #
 
-RTOBJS = rtmain.o rtrace.o $(ROBJS)
-RTSRC = rmain.c rtrace.c $(RSRC)
+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 image.o $(ROBJS)
-RPSRC = rmain.c rpict.c image.c $(RSRC)
+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 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 freeobjmem.o $(DOBJS) $(ROBJS) Version.o
+RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
 
-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 ambio.o
+RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
 
-RAYOBJS = raytrace.o ambient.o
-RAYSRC = raytrace.c ambient.c
+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 \
+		srcsamp.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 = 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
 
-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 malloc.o data.o \
+	readfargs.o
+SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
+	readfargs.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
+HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
 #
 # What this makefile produces:
@@ -90,13 +89,25 @@ MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS) $(DRIVERS)
+all:	$(PROGS) $(SPECIAL)
 
-install:	all
+install:	$(PROGS) $(SPECIAL) rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
+	rm -f $(LIBDIR)/rayinit.cal
+	cp rayinit.cal $(LIBDIR)
 
+sun:	$(DEVDIR)/sun $(DEVDIR)/sun.com
+
+x10:	$(DEVDIR)/x10
+
+aed:	$(DEVDIR)/aed
+
+sgi:	$(DEVDIR)/news
+
+tiff:	
+
 clean:
-	rm -f *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
 lint:	$(RVSRC)
 	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
@@ -114,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 \
@@ -124,32 +135,46 @@ editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
 $(DEVDIR)/sun.com:	suncom.o editline.o
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.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)
+$(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)
+
+$(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
+	$(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
@@ -158,80 +183,97 @@ devcomm.o:	devcomm.c
 sundev.o:	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
 
-ambient.o:	ambient.c
-	$(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
+aed.o:	aed.c
+	$(CC) $(CFLAGS) -Daed_init=dinit -c aed.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
+	$(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
 
 nwsdev.h:	nwsdev.cps newsconstants.h
 	cps nwsdev.cps
 
 #
-# Include dependencies:
+# Version module:
 #
 
-caldefn.o calexpr.o calfunc.o:	calcomp.h
+Version.c:	VERSION $(RSRC) $(HEADERS)
+	( cat VERSION ; date ; whoami ; hostname ) > Version.c
+	ed - Version.c < verscript.ed
 
-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
+#
+# Include dependencies:
+#
 
-cone.o o_cone.o source.o:	cone.h
+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
+
 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 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
 
-o_instance.o instance.o:	instance.h octree.h
+ambient.o ambcomp.o aniso.o normal.o rpict.o \
+source.o rv3.o srcsamp.o virtuals.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 aniso.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 fvect.h object.h color.h
+rtrace.o rview.o rv2.o rv3.o source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o \
+sphere.o m_mist.o t_data.o t_func.o persist.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
+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 face.o image.o initotypes.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 freeobjmem.o initotypes.o fprism.o \
+duphead.o octree.o:	../common/standard.h ../common/mat4.h ../common/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 srcdraw.o:	../common/view.h
 
 x10.o xtwind.o:	xtwind.h
 
 x11.o x11twind.o: x11twind.h
+
+x11.o:	x11icon.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