--- ray/src/gen/Rmakefile	1991/08/22 08:55:34	1.18
+++ ray/src/gen/Rmakefile	2012/10/13 20:15:43	2.29
@@ -1,80 +1,120 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.29 2012/10/13 20:15:43 greg Exp $
 #
 # Makefile for object generation programs
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE
-CFLAGS = $(MACH) $(OPT) -I../common
+MACH = -DBSD
+CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 
-LIBDIR = /lumen/lumen/ray/lib
+LIBDIR = /usr/local/lib/ray
 
-PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks mkillum
+PROGS = genbox gensky xform genblinds genrev genworm gendaylit \
+		gensurf genprism replmarks mkillum mksource 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 perezlum.cal coeff_perez.dat defangle.dat
 
 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
+	$(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)
 
+gendaylit:	gendaylit.o sun.o
+	$(CC) $(CFLAGS) -o gendaylit gendaylit.o sun.o -lrtrad $(MLIB)
+
+# gendaylit:	H32_gendaylit.o
+#	$(CC) $(CFLAGS) -o gendaylit H32_gendaylit.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 ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o xform xform.o -lrtrad $(MLIB)
 
 replmarks:	replmarks.o
-	cc $(CFLAGS) -o replmarks replmarks.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrtrad $(MLIB)
 
 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 \
+-lraycalls -lradiance -lrtrad $(MLIB)
 
+mksource:	mksource.o
+	$(CC) $(CFLAGS) -o mksource mksource.o \
+-lraycalls -lradiance -lrtrad $(MLIB)
+
 genrev:	genrev.o 
-	cc $(CFLAGS) -o genrev genrev.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o genrev genrev.o -lrtrad $(MLIB)
 
+gencatenary: gencat.o
+	$(CC) $(CFLAGS) -o gencatenary gencat.o -lrtrad $(MLIB)
+
 genworm:	genworm.o
-	cc $(CFLAGS) -o genworm genworm.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o genworm genworm.o -lrtrad $(MLIB)
 
 gensurf:	gensurf.o
-	cc $(CFLAGS) -o gensurf gensurf.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrtrad $(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
+mksource.o:	../common/random.h ../rt/ray.h ../common/octree.h \
+../common/object.h ../common/color.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.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
 
-mkillum.o mkillum2.o mkillum3.o:	mkillum.h ../common/standard.h \
-../common/mat4.h ../common/fvect.h ../common/otypes.h ../common/object.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/otypes.h ../rt/ray.h ../common/octree.h \
+../common/object.h ../common/color.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/random.h
+
+mkillum2.o:	../rt/source.h ../common/face.h ../common/cone.h
+
+mkillum2.o mkillum3.o:	../common/paths.h
+
+gensky.o:	../common/color.h
+
+gensurf.o genworm.o genrev.o:	../common/calcomp.h