--- ray/src/gen/Rmakefile	2007/11/24 00:37:27	2.19
+++ ray/src/gen/Rmakefile	2009/06/15 22:27:21	2.25
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.19 2007/11/24 00:37:27 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.25 2009/06/15 22:27:21 greg Exp $
 #
 # Makefile for object generation programs
 #
@@ -13,11 +13,11 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = genbox gensky xform genblinds genrev genworm \
+PROGS = genbox gensky xform genblinds genrev genworm gendaylit \
 		gensurf genprism replmarks mkillum mksource genclock
 
 LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
-		glaze1.cal glaze2.cal
+		glaze1.cal glaze2.cal perezlum.cal coeff_perez.dat defangle.dat
 
 all:	$(PROGS)
 
@@ -43,11 +43,14 @@ genmarble:	genmarble.o ../common/random.h
 gensky:	gensky.o sun.o
 	$(CC) $(CFLAGS) -o gensky gensky.o sun.o $(MLIB)
 
+gendaylit:	gendaylit.o sun.o
+	$(CC) $(CFLAGS) -o gendaylit gendaylit.o sun.o -lrtrad $(MLIB)
+
 genblinds:	genblinds.o
 	$(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 -lrtrad $(MLIB)
@@ -55,9 +58,9 @@ xform:	xform.o
 replmarks:	replmarks.o
 	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrtrad $(MLIB)
 
-mkillum:	mkillum.o mkillum2.o mkillum3.o mkillum4.o ezxml.o
+mkillum:	mkillum.o mkillum2.o mkillum3.o bsdf.o ezxml.o
 	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
-mkillum4.o ezxml.o -lraycalls -lradiance -lrtrad $(MLIB)
+bsdf.o ezxml.o -lraycalls -lradiance -lrtrad $(MLIB)
 
 mksource:	mksource.o
 	$(CC) $(CFLAGS) -o mksource mksource.o \
@@ -85,27 +88,36 @@ mksource.o:	../common/random.h ../rt/ray.h ../common/o
 ../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/tifftypes.h
+../common/rterror.h
 
 genworm.o replmarks.o:	../common/fvect.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 ../common/tifftypes.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 mkillum4.o:	mkillum.h \
+mkillum.o mkillum2.o mkillum3.o:	mkillum.h bsdf.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/tifftypes.h
+../common/rterror.h ../common/random.h
 
-ezxml.o mkillum4.o:	ezxml.h
+mkillum2.o:	../rt/source.h ../common/face.h ../common/cone.h
+
+bsdf.o:	bsdf.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
+
+mkillum3.o bsdf.o:	../common/paths.h
+
+ezxml.o bsdf.o:	ezxml.h
 
 gensky.o:	../common/color.h