--- ray/src/rt/Rmakefile	1991/07/16 15:56:40	1.54
+++ ray/src/rt/Rmakefile	1991/10/08 15:32:43	1.61
@@ -1,12 +1,11 @@
-# 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) -I../common
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 CC = cc
 LINT = lint
 LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
@@ -28,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):
@@ -73,8 +72,10 @@ 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
-SUPPSRC = zeroes.c calexpr.c caldefn.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
 
 #
 # What this makefile produces:
@@ -84,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
 
@@ -93,6 +96,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+tiff:	
+
 clean:
 	set nonomatch; rm -f $(PROGS) *.o core
 
@@ -112,8 +117,6 @@ $(DESTDIR)/rpict:	$(RPOBJS)
 $(DESTDIR)/rview:	$(RVOBJS)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
 
-$(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview:	../common/librt.a
-
 $(DESTDIR)/lookamb:	lookamb.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
 
@@ -148,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 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