--- ray/src/gen/Rmakefile	1991/07/24 16:48:28	1.17
+++ ray/src/gen/Rmakefile	1992/07/01 15:07:08	2.2
@@ -5,63 +5,69 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE
-CFLAGS = $(MACH) $(OPT) -I../common
+MACH = -DBSD
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+CC = cc
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 
+LIBDIR = /usr/local/lib/ray
+
 PROGS = genbox gensky xform genblinds genrev genworm \
 		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:
 	set nonomatch; rm -f $(PROGS) *.o core
 
 genbeads:	genbeads.o hermite3.o
-	cc $(CFLAGS) -o genbeads genbeads.o hermite3.o -lm
+	$(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o -lm
 
 genbox:	genbox.o
-	cc $(CFLAGS) -o genbox genbox.o
+	$(CC) $(CFLAGS) -o genbox genbox.o
 
 genmarble:	genmarble.o ../common/random.h
-	cc $(CFLAGS) -o genmarble genmarble.o -lm
+	$(CC) $(CFLAGS) -o genmarble genmarble.o -lm
 
 gensky:	gensky.o sun.o
-	cc $(CFLAGS) -o gensky gensky.o sun.o -lm
+	$(CC) $(CFLAGS) -o gensky gensky.o sun.o -lm
 
 genblinds:	genblinds.o
-	cc $(CFLAGS) -o genblinds genblinds.o -lm
+	$(CC) $(CFLAGS) -o genblinds genblinds.o -lm
 
 genprism:	genprism.o
-	cc $(CFLAGS) -o genprism genprism.o
+	$(CC) $(CFLAGS) -o genprism genprism.o
 
 xform:	xform.o
-	cc $(CFLAGS) -o xform xform.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o xform xform.o -lrt -lm
 
 replmarks:	replmarks.o
-	cc $(CFLAGS) -o replmarks replmarks.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrt -lm
 
 mkillum:	mkillum.o mkillum2.o mkillum3.o
-	cc $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
-../common/librt.a -lm
+	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt -lm
 
 genrev:	genrev.o 
-	cc $(CFLAGS) -o genrev genrev.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o genrev genrev.o -lrt -lm
 
 genworm:	genworm.o
-	cc $(CFLAGS) -o genworm genworm.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o genworm genworm.o -lrt -lm
 
 gensurf:	gensurf.o
-	cc $(CFLAGS) -o gensurf gensurf.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrt -lm
 
 genbranch:	genbranch.o
-	cc $(CFLAGS) -o genbranch genbranch.o -lm
+	$(CC) $(CFLAGS) -o genbranch genbranch.o -lm
 
 gensurf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
@@ -72,3 +78,5 @@ xform.o:	../common/standard.h ../common/mat4.h ../comm
 
 mkillum.o mkillum2.o mkillum3.o:	mkillum.h ../common/standard.h \
 ../common/mat4.h ../common/fvect.h ../common/otypes.h ../common/object.h
+
+gensky.o:	../common/color.h