--- ray/src/gen/Rmakefile	1991/02/17 22:37:05	1.10
+++ ray/src/gen/Rmakefile	2013/08/09 16:51:15	2.32
@@ -1,80 +1,122 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.32 2013/08/09 16:51:15 greg Exp $
 #
 # Makefile for object generation programs
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/f68881.il -DIEEE
-CFLAGS = $(MACH) $(OPT)
+MACH = -DBSD
+CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
-INSTDIR = /usr/local/ray
+INSTDIR = /usr/local/bin
 
-PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks
+LIBDIR = /usr/local/lib/ray
 
+PROGS = genbox gensky xform genblinds genrev genworm gendaylit gendaymtx \
+		gensurf genprism replmarks mkillum mksource genclock
+
+LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
+		glaze1.cal glaze2.cal perezlum.cal
+
 all:	$(PROGS)
 
-install:	$(PROGS) genpine.csh genwindow.csh
+install:	$(PROGS) $(LIBFILES) glaze.csh
 	cp $(PROGS) $(INSTDIR)
-	install genpine.csh $(INSTDIR)/genpine
-	install genwindow.csh $(INSTDIR)/genwindow
+	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 random.h
-	cc $(CFLAGS) -o genmarble genmarble.o -lm
+genmarble:	genmarble.o ../common/random.h
+	$(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)
+
+gendaymtx:	gendaymtx.o sun.o
+	$(CC) $(CFLAGS) -o gendaymtx gendaymtx.o sun.o -lrtrad $(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 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 -lrtrad $(MLIB)
 
-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 -lrtrad $(MLIB)
 
-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 \
+-lraycalls -lradiance -lrtrad $(MLIB)
 
-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
+mksource:	mksource.o
+	$(CC) $(CFLAGS) -o mksource mksource.o \
+-lraycalls -lradiance -lrtrad $(MLIB)
 
-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
+genrev:	genrev.o 
+	$(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 -lrtrad $(MLIB)
+
+gensurf:	gensurf.o
+	$(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)
 
-calexpr.o:	calexpr.c calcomp.h
-	cc $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
+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
 
-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
+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
 
-gensurf.o:	standard.h mat4.h fvect.h
+genworm.o genrev.o gensurf.o:	../common/resolu.h ../common/rterror.h
 
-fvect.o genworm.o replmarks.o:	fvect.h
+xform.o:	../common/otypes.h ../common/object.h
 
-mat4.o:		mat4.h fvect.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
 
-xform.o:	standard.h mat4.h fvect.h otypes.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
+
+sun.o:	sun.h