--- ray/src/gen/Rmakefile	1991/03/19 12:11:03	1.12
+++ ray/src/gen/Rmakefile	1991/08/22 08:55:34	1.18
@@ -6,22 +6,28 @@
 
 OPT = -O
 MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE
-CFLAGS = $(MACH) $(OPT)
+CFLAGS = $(MACH) $(OPT) -I../common
 
 INSTDIR = /lumen/lumen/ray/bin.sun3
 
+LIBDIR = /lumen/lumen/ray/lib
+
 PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks
+		gensurf genprism replmarks mkillum
 
+CALFILES = illum.cal rev.cal skybright.cal surf.cal
+
 all:	$(PROGS)
 
-install:	$(PROGS) genpine.csh genwindow.csh
+install:	$(PROGS) genpine.csh genwindow.csh $(CALFILES)
 	cp $(PROGS) $(INSTDIR)
 	cp genwindow.csh $(INSTDIR)/genwindow
 	chmod 755 $(INSTDIR)/genwindow
+	cd $(LIBDIR) ; rm -f $(CALFILES)
+	cp $(CALFILES) $(LIBDIR)
 
 clean:
-	rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
 genbeads:	genbeads.o hermite3.o
 	cc $(CFLAGS) -o genbeads genbeads.o hermite3.o -lm
@@ -29,7 +35,7 @@ genbeads:	genbeads.o hermite3.o
 genbox:	genbox.o
 	cc $(CFLAGS) -o genbox genbox.o
 
-genmarble:	genmarble.o random.h
+genmarble:	genmarble.o ../common/random.h
 	cc $(CFLAGS) -o genmarble genmarble.o -lm
 
 gensky:	gensky.o sun.o
@@ -41,43 +47,34 @@ genblinds:	genblinds.o
 genprism:	genprism.o
 	cc $(CFLAGS) -o genprism genprism.o
 
-xform:	xform.o xf.o mat4.o fgetline.o
-	cc $(CFLAGS) -o xform xform.o xf.o mat4.o fgetline.o -lm
+xform:	xform.o
+	cc $(CFLAGS) -o xform xform.o ../common/librt.a -lm
 
-replmarks:	replmarks.o fvect.o fgetline.o
-	cc $(CFLAGS) -o replmarks replmarks.o fvect.o fgetline.o -lm
+replmarks:	replmarks.o
+	cc $(CFLAGS) -o replmarks replmarks.o ../common/librt.a -lm
 
-genrev:	genrev.o calexpr.o caldefn.o calfunc.o \
-ealloc.o savestr.o
-	cc $(CFLAGS) -o genrev genrev.o caldefn.o calexpr.o \
-calfunc.o ealloc.o savestr.o -lm
+mkillum:	mkillum.o mkillum2.o mkillum3.o
+	cc $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
+../common/librt.a -lm
 
-genworm:	genworm.o calexpr.o caldefn.o calfunc.o \
-ealloc.o savestr.o fvect.o
-	cc $(CFLAGS) -o genworm genworm.o caldefn.o calexpr.o \
-calfunc.o ealloc.o savestr.o fvect.o -lm
+genrev:	genrev.o 
+	cc $(CFLAGS) -o genrev genrev.o ../common/librt.a -lm
 
-gensurf:	gensurf.o fvect.o calexpr.o caldefn.o calfunc.o \
-ealloc.o savestr.o
-	cc $(CFLAGS) -o gensurf gensurf.o caldefn.o calexpr.o \
-calfunc.o ealloc.o savestr.o fvect.o -lm
+genworm:	genworm.o
+	cc $(CFLAGS) -o genworm genworm.o ../common/librt.a -lm
 
+gensurf:	gensurf.o
+	cc $(CFLAGS) -o gensurf gensurf.o ../common/librt.a -lm
+
 genbranch:	genbranch.o
 	cc $(CFLAGS) -o genbranch genbranch.o -lm
 
-calexpr.o:	calexpr.c calcomp.h
-	cc $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
+gensurf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
-caldefn.o:	caldefn.c calcomp.h
-	cc $(CFLAGS) -c -DFUNCTION caldefn.c
+genworm.o replmarks.o:	../common/fvect.h
 
-calfunc.o:	calfunc.c calcomp.h
-	cc $(CFLAGS) -c -DVARIABLE -DBIGLIB calfunc.c
+xform.o:	../common/standard.h ../common/mat4.h ../common/fvect.h \
+../common/otypes.h ../common/object.h
 
-gensurf.o:	standard.h mat4.h fvect.h
-
-fvect.o genworm.o replmarks.o:	fvect.h
-
-mat4.o:		mat4.h fvect.h
-
-xform.o:	standard.h mat4.h fvect.h otypes.h
+mkillum.o mkillum2.o mkillum3.o:	mkillum.h ../common/standard.h \
+../common/mat4.h ../common/fvect.h ../common/otypes.h ../common/object.h