--- ray/src/gen/Rmakefile 2009/06/12 17:37:37 2.24 +++ ray/src/gen/Rmakefile 2009/06/17 20:41:47 2.26 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.24 2009/06/12 17:37:37 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.26 2009/06/17 20:41:47 greg Exp $ # # Makefile for object generation programs # @@ -17,7 +17,7 @@ PROGS = genbox gensky xform genblinds genrev genworm g 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 coeff_perez.dat defangle.dat all: $(PROGS) @@ -58,9 +58,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 \ @@ -101,7 +101,7 @@ genworm.o genrev.o gensurf.o: ../common/resolu.h ../co 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/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 \ @@ -110,14 +110,7 @@ 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 - -mkillum3.o bsdf.o: ../common/paths.h - -ezxml.o bsdf.o: ezxml.h +mkillum3.o: ../common/paths.h gensky.o: ../common/color.h