--- ray/src/gen/Rmakefile	1992/07/01 15:07:08	2.2
+++ ray/src/gen/Rmakefile	2003/02/22 02:07:23	2.7
@@ -1,73 +1,80 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.7 2003/02/22 02:07:23 greg Exp $
 #
 # Makefile for object generation programs
 #
 
 OPT = -O
 MACH = -DBSD
-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
 CC = cc
+MLIB = -lm
 
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
 PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks mkillum
+		gensurf genprism replmarks mkillum genclock
 
-CALFILES = illum.cal rev.cal skybright.cal surf.cal
+LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
+		glaze1.cal glaze2.cal
 
 all:	$(PROGS)
 
-install:	$(PROGS) genpine.csh genwindow.csh $(CALFILES)
+install:	$(PROGS) $(LIBFILES) glaze.csh
 	cp $(PROGS) $(INSTDIR)
-	cp genwindow.csh $(INSTDIR)/genwindow
-	chmod 755 $(INSTDIR)/genwindow
-	cd $(LIBDIR) ; rm -f $(CALFILES)
-	cp $(CALFILES) $(LIBDIR)
+	cp glaze.csh $(INSTDIR)/glaze
+	chmod 755 $(INSTDIR)/glaze
+	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cp $(LIBFILES) $(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 $(MLIB)
 
 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 $(MLIB)
 
 gensky:	gensky.o sun.o
-	$(CC) $(CFLAGS) -o gensky gensky.o sun.o -lm
+	$(CC) $(CFLAGS) -o gensky gensky.o sun.o $(MLIB)
 
 genblinds:	genblinds.o
-	$(CC) $(CFLAGS) -o genblinds genblinds.o -lm
+	$(CC) $(CFLAGS) -o genblinds genblinds.o $(MLIB)
 
 genprism:	genprism.o
-	$(CC) $(CFLAGS) -o genprism genprism.o
+	$(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
 
 xform:	xform.o
-	$(CC) $(CFLAGS) -o xform xform.o -lrt -lm
+	$(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
 
 replmarks:	replmarks.o
-	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrt -lm
+	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
 
 mkillum:	mkillum.o mkillum2.o mkillum3.o
-	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt -lm
+	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
 
 genrev:	genrev.o 
-	$(CC) $(CFLAGS) -o genrev genrev.o -lrt -lm
+	$(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
 
+gencat: gencat.o
+	$(CC) $(CFLAGS) -o gencat gencat.o -lrt $(MLIB)
+
 genworm:	genworm.o
-	$(CC) $(CFLAGS) -o genworm genworm.o -lrt -lm
+	$(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
 
 gensurf:	gensurf.o
-	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrt -lm
+	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
 
+genclock:	genclock.o
+	$(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
+
 genbranch:	genbranch.o
-	$(CC) $(CFLAGS) -o genbranch genbranch.o -lm
+	$(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB)
 
 gensurf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h