--- ray/src/rt/Rmakefile	1991/08/22 08:59:23	1.58
+++ ray/src/rt/Rmakefile	1991/08/26 10:14:21	1.60
@@ -5,11 +5,12 @@
 
 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 \
 -DINCHAN -DRCONST -DREDEFW -DBIGLIB
+COMPAT = malloc.o
 
 #
 # The following are user-definable:
@@ -27,7 +28,7 @@ LIBDIR = /usr/local/lib/ray
 #
 # Library routines:
 #
-LIBS = ../common/librt.a -lm
+LIBS = -lrt -lm
 
 #
 # Device drivers for rview (see also devtable.c):
@@ -52,7 +53,7 @@ RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS
 RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
 
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
-	$(MODOBJS) $(SUPPOBJS)
+	$(MODOBJS) $(SUPPOBJS) $(COMPAT)
 RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
 	$(MODSRC) $(SUPPSRC)
 
@@ -106,13 +107,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
@@ -151,6 +152,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: