--- ray/src/gen/Rmakefile	1996/03/19 12:37:44	2.6
+++ ray/src/gen/Rmakefile	2004/08/21 11:54:06	2.12
@@ -1,12 +1,11 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.12 2004/08/21 11:54:06 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
 
@@ -17,13 +16,16 @@ LIBDIR = /usr/local/lib/ray
 PROGS = genbox gensky xform genblinds genrev genworm \
 		gensurf genprism replmarks mkillum genclock
 
-LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex
+LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
+		glaze1.cal glaze2.cal
 
 all:	$(PROGS)
 
-install:	$(PROGS) $(LIBFILES)
+install:	$(PROGS) $(LIBFILES) glaze.csh
 	cp $(PROGS) $(INSTDIR)
-	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cp glaze.csh $(INSTDIR)/glaze
+	chmod 755 $(INSTDIR)/glaze
+	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
@@ -59,6 +61,9 @@ mkillum:	mkillum.o mkillum2.o mkillum3.o
 genrev:	genrev.o 
 	$(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
 
+gencatenary: gencat.o
+	$(CC) $(CFLAGS) -o gencatenary gencat.o -lrt $(MLIB)
+
 genworm:	genworm.o
 	$(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
 
@@ -71,14 +76,20 @@ genclock:	genclock.o
 genbranch:	genbranch.o
 	$(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB)
 
-gensurf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
-
 genworm.o replmarks.o:	../common/fvect.h
 
-xform.o:	../common/standard.h ../common/mat4.h ../common/fvect.h \
-../common/otypes.h ../common/object.h
+gensurf.o xform.o:	../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/rterror.h \
+../common/mat4.h ../common/fvect.h
 
+genworm.o genrev.o gensurf.o:	../common/resolu.h ../common/rterror.h
+
+xform.o:	../common/otypes.h ../common/object.h
+
 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
+
+gensurf.o genworm.o genrev.o:	../common/calcomp.h