--- ray/src/common/Rmakefile	1991/07/16 10:28:51	1.4
+++ ray/src/common/Rmakefile	1992/09/08 09:09:19	2.9
@@ -3,39 +3,49 @@
 # Makefile for ray tracing library routines
 #
 
-OPT = -O -pipe
-MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
+OPT = -O
+MACH = -DBSD
 CFLAGS = $(MACH) $(OPT)
+CC = cc
 
+COMPAT = bmalloc.o erf.o strcmp.o # frexp.o fwrite.o random.o
+
 LIBDIR = /usr/local/lib/ray
 
 RTOBJ = cone.o face.o instance.o readobj.o readoct.o otypes.o objset.o \
-	octree.o
+	octree.o readfargs.o modobject.o
 
 PICOBJ = color.o header.o image.o lamps.o resolu.o rexpr.o spec_rgb.o \
-	colrops.o 
+	colrops.o font.o
 
-STDOBJ = fgetline.o fropen.o linregr.o xf.o mat4.o misc.o fvect.o \
-	calexpr.o caldefn.o calfunc.o calprnt.o \
-	savestr.o urand.o cputs.o wputs.o eputs.o quit.o
+STDOBJ = fgetline.o fropen.o linregr.o xf.o mat4.o fvect.o urand.o \
+	urind.o peano.o calexpr.o caldefn.o calfunc.o calprnt.o \
+	multisamp.o process.o getpath.o error.o savestr.o savqstr.o \
+	badarg.o fgetword.o words.o wordfile.o cputs.o wputs.o eputs.o quit.o
 
-SYSOBJ = ealloc.o bmalloc.o # erf.o frexp.o fwrite.o random.o bcopy.o
+SYSOBJ = ealloc.o portio.o $(COMPAT)
 
 librt.a:	$(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
 	ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-	@ ranlib librt.a
+	-ranlib librt.a
 
+install:	librt.a
+	mv librt.a ../lib
+
+clean:
+	rm -f *.o librt.a
+
 fropen.o:	fropen.c
-	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c
+	$(CC) $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c
 
 calexpr.o:	calexpr.c calcomp.h
-	cc $(CFLAGS) -DVARIABLE -DFUNCTION -DRCONST -c calexpr.c
+	$(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DRCONST -c calexpr.c
 
 caldefn.o:	caldefn.c calcomp.h
-	cc $(CFLAGS) -DFUNCTION -c caldefn.c
+	$(CC) $(CFLAGS) -DFUNCTION -c caldefn.c
 
 calfunc.o:	calfunc.c calcomp.h
-	cc $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
+	$(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
 
 color.o colrops.o resolu.o spec_rgb.o:	color.h
 
@@ -52,17 +62,25 @@ linregr.o:	linregr.h
 mat4.o:		mat4.h fvect.h
 
 cone.o face.o instance.o objset.o otypes.o \
-readobj.o readoct.o:	object.h
+modobject.o readfargs.o readobj.o readoct.o:	object.h
 
 objset.o octree.o readoct.o:	octree.h
 
-cone.o objset.o otypes.o readobj.o readoct.o:	otypes.h
+cone.o modobject.o objset.o otypes.o readobj.o readoct.o:	otypes.h
 
 urand.o:	random.h
 
-cone.o face.o image.o instance.o misc.o objset.o octree.o \
+cone.o face.o image.o instance.o error.o objset.o octree.o modobject.o \
 otypes.o readobj.o readoct.o xf.o:	standard.h mat4.h fvect.h
 
+readfargs.o:	fvect.h
+
 image.o:	view.h
 
 calprnt.o:	calcomp.h
+
+process.o:	vfork.h
+
+font.o:	font.h
+
+fropen.o getpath.o image.o:	paths.h