--- ray/src/rt/Rmakefile	1991/08/16 12:54:48	1.57
+++ ray/src/rt/Rmakefile	1991/10/08 15:32:43	1.61
@@ -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):
@@ -72,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 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
 
 #
 # What this makefile produces:
@@ -83,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
 
@@ -104,13 +108,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
@@ -149,6 +153,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: