--- ray/src/gen/Rmakefile	2009/06/12 17:37:37	2.24
+++ ray/src/gen/Rmakefile	2023/02/09 00:18:05	2.42
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.24 2009/06/12 17:37:37 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.42 2023/02/09 00:18:05 greg Exp $
 #
 # Makefile for object generation programs
 #
@@ -9,48 +9,53 @@ CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 CC = cc
 MLIB = -lm
 
+INSTALL = cp
+
 INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = genbox gensky xform genblinds genrev genworm gendaylit \
+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
+		glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal
 
 all:	$(PROGS)
 
 install:	$(PROGS) $(LIBFILES) glaze.csh
-	cp $(PROGS) $(INSTDIR)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 	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
+	set nonomatch; rm -f $(PROGS) *.o
 
 genbeads:	genbeads.o hermite3.o
 	$(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB)
 
 genbox:	genbox.o
-	$(CC) $(CFLAGS) -o genbox genbox.o
+	$(CC) $(CFLAGS) -o genbox genbox.o -lwfobj -lrtrad $(MLIB)
 
 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 $(MLIB)
+	$(CC) $(CFLAGS) -o gensky gensky.o sun.o -lrtrad $(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 $(MLIB)
+	$(CC) $(CFLAGS) -o genblinds genblinds.o -lrtrad $(MLIB)
 
 genprism:	genprism.o
-	$(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
+	$(CC) $(CFLAGS) -o genprism genprism.o -lrtrad $(MLIB)
 
 xform:	xform.o
 	$(CC) $(CFLAGS) -o xform xform.o -lrtrad $(MLIB)
@@ -58,9 +63,9 @@ xform:	xform.o
 replmarks:	replmarks.o
 	$(CC) $(CFLAGS) -o replmarks replmarks.o -lrtrad $(MLIB)
 
-mkillum:	mkillum.o mkillum2.o mkillum3.o bsdf.o ezxml.o
+mkillum:	mkillum.o mkillum2.o mkillum3.o
 	$(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o \
-bsdf.o ezxml.o -lraycalls -lradiance -lrtrad $(MLIB)
+-lraycalls -lradiance -lrtrad $(MLIB)
 
 mksource:	mksource.o
 	$(CC) $(CFLAGS) -o mksource mksource.o \
@@ -97,11 +102,13 @@ gensurf.o xform.o:	../common/standard.h \
 ../common/rtmath.h ../common/rterror.h \
 ../common/mat4.h ../common/fvect.h
 
+genbox.o:	../common/fvect.h ../common/objutil.h ../common/rtio.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 bsdf.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 \
@@ -110,15 +117,13 @@ mkillum.o mkillum2.o mkillum3.o:	mkillum.h bsdf.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
+mkillum2.o mkillum3.o:	../common/paths.h
 
-mkillum3.o bsdf.o:	../common/paths.h
-
-ezxml.o bsdf.o:	ezxml.h
-
 gensky.o:	../common/color.h
 
 gensurf.o genworm.o genrev.o:	../common/calcomp.h
+
+gendaylit.o gensky.o sun.o:	sun.h
+
+gendaymtx.o:	../common/platform.h ../common/rtmath.h \
+../common/mat4.h ../common/fvect.h ../common/color.h