--- ray/src/gen/Rmakefile	2003/10/20 15:10:18	2.10
+++ ray/src/gen/Rmakefile	2008/02/07 23:02:13	2.21
@@ -1,11 +1,11 @@
-# RCSid: $Id: Rmakefile,v 2.10 2003/10/20 15:10:18 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.21 2008/02/07 23:02:13 greg Exp $
 #
 # Makefile for object generation programs
 #
 
 OPT = -O
 MACH = -DBSD
-CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 CC = cc
 MLIB = -lm
 
@@ -14,7 +14,7 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = genbox gensky xform genblinds genrev genworm \
-		gensurf genprism replmarks mkillum genclock
+		gensurf genprism replmarks mkillum mksource genclock
 
 LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \
 		glaze1.cal glaze2.cal
@@ -50,25 +50,30 @@ genprism:	genprism.o
 	$(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
 
 xform:	xform.o
-	$(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o xform xform.o -lrtrad $(MLIB)
 
 replmarks:	replmarks.o
-	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
+	$(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 -lrt $(MLIB)
+mkillum:	mkillum.o mkillum2.o mkillum3.o mkillum4.o ezxml.o
+	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
+mkillum4.o ezxml.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 -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o genrev genrev.o -lrtrad $(MLIB)
 
-gencat: gencat.o
-	$(CC) $(CFLAGS) -o gencat gencat.o -lrt $(MLIB)
+gencatenary: gencat.o
+	$(CC) $(CFLAGS) -o gencatenary gencat.o -lrtrad $(MLIB)
 
 genworm:	genworm.o
-	$(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o genworm genworm.o -lrtrad $(MLIB)
 
 gensurf:	gensurf.o
-	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o gensurf gensurf.o -lrtrad $(MLIB)
 
 genclock:	genclock.o
 	$(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
@@ -76,18 +81,36 @@ genclock:	genclock.o
 genbranch:	genbranch.o
 	$(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB)
 
+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 ../common/tifftypes.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/mat4.h ../common/fvect.h ../common/tifftypes.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
+mkillum.o mkillum2.o mkillum3.o mkillum4.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/tifftypes.h ../common/random.h
 
+mkillum2.o:	../rt/source.h ../common/face.h ../common/cone.h
+
+mkillum3.o mkillum4.o:	../common/paths.h
+
+ezxml.o mkillum4.o:	ezxml.h
+
 gensky.o:	../common/color.h
 
-genworm.o genrev.o:	../common/calcomp.h
+gensurf.o genworm.o genrev.o:	../common/calcomp.h