--- ray/src/rt/Rmakefile	1991/07/19 09:32:58	1.56
+++ ray/src/rt/Rmakefile	1991/10/21 12:57:53	1.64
@@ -5,7 +5,7 @@
 
 OPT = -O -pipe
 MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
-CFLAGS = $(MACH) $(OPT) -I../common
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 CC = cc
 LINT = lint
 LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
@@ -27,7 +27,7 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = ../common/librt.a -lm
+LIBS = -lrt -lm
 
 #
 # Device drivers for rview (see also devtable.c):
@@ -42,14 +42,14 @@ DLIBS = -lX11
 # Standard object files:
 #
 
-RTOBJS = rtmain.o rtrace.o $(ROBJS)
-RTSRC = rmain.c rtrace.c $(RSRC)
+RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
+RTSRC = rmain.c rtrace.c $(RSRC) Version.c
 
-RPOBJS = rpmain.o rpict.o $(ROBJS)
-RPSRC = rmain.c rpict.c $(RSRC)
+RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
+RPSRC = rmain.c rpict.c $(RSRC) Version.c
 
-RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
-RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
+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
 
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS)
@@ -59,10 +59,10 @@ RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
 RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
 RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.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
@@ -72,9 +72,13 @@ MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf
 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
-SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.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
 
+HEADERS = ambient.h ray.h data.h otspecial.h source.h
+
 #
 # What this makefile produces:
 #
@@ -83,8 +87,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
 
@@ -92,6 +98,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+tiff:	
+
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
 
@@ -102,13 +110,13 @@ lint:	$(RVSRC)
 # Links:
 #
 
-$(DESTDIR)/rtrace:	$(RTOBJS) ../common/librt.a
+$(DESTDIR)/rtrace:	$(RTOBJS)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
 
-$(DESTDIR)/rpict:	$(RPOBJS) ../common/librt.a
+$(DESTDIR)/rpict:	$(RPOBJS)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
 
-$(DESTDIR)/rview:	$(RVOBJS) ../common/librt.a
+$(DESTDIR)/rview:	$(RVOBJS)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o
@@ -148,6 +156,9 @@ rvmain.o:	rmain.c
 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 to model dispersion:
 #
@@ -184,6 +195,14 @@ nwsdev.h:	nwsdev.cps newsconstants.h
 	cps nwsdev.cps
 
 #
+# Version module:
+#
+
+Version.c:	VERSION $(RSRC) $(HEADERS)
+	( cat VERSION ; date ; whoami ; hostname ) > Version.c
+	ed - Version.c < verscript.ed
+
+#
 # Include dependencies:
 #
 
@@ -208,7 +227,7 @@ 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 ambcomp.o rpict.o rv3.o source.o:	../common/random.h
+ambient.o ambcomp.o rpict.o rv3.o srcsamp.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 \
@@ -219,10 +238,12 @@ t_data.o t_func.o:	ray.h ../common/standard.h ../commo
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h
 
-mirror.o source.o srcsupp.o virtuals.o:	source.h
+mirror.o source.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
+srcsamp.o:	../common/object.h
+
 cone.o data.o devcomm.o initotypes.o \
-octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+octree.o srcsamp.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
 initotypes.o raytrace.o:	otspecial.h