--- ray/src/util/Rmakefile 2014/02/01 01:28:43 2.65 +++ ray/src/util/Rmakefile 2014/04/08 23:46:05 2.70 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.65 2014/02/01 01:28:43 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.70 2014/04/08 23:46:05 greg Exp $ # # Radiance makefile for utility programs # @@ -20,7 +20,8 @@ INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ - vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate + vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \ + eplus_adduvf all: $(PROGS) @@ -88,9 +89,6 @@ rsensor: rsensor.o rpiece: rpiece.o Version.o $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB) -rtcontrib: rtcontrib.o Version.o - $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB) - vwright: vwright.o $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB) @@ -114,9 +112,17 @@ rttree_reduce: rttree_reduce.o rcollate: rcollate.o $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad +eplus_adduvf: eplus_adduvf.o eplus_idf.o + $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \ +-lrtrad $(MLIB) + setscan.o: setscan.h -eplus_idf.o: eplus_idf.h \ +eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \ +../common/paths.h ../common/rtio.h ../common/random.h \ +../common/rtmath.h ../common/mat4.h ../common/fvect.h + +eplus_adduvf.o eplus_idf.o: eplus_idf.h \ ../common/lookup.h findglare.o glareval.o \ @@ -145,11 +151,7 @@ cmbsdf.o: ../common/paths.h ../common/bsdf.h ../common dctimestep.o cmatrix.o: ../common/platform.h -rtcontrib.o: ../common/platform.h ../common/rtprocess.h \ -../common/color.h ../common/resolu.h ../common/lookup.h \ -../common/calcomp.h ../common/selcall.h - -rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o: ../common/standard.h \ +rad.o ranimate.o rpiece.o xglaresrc.o: ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ ../common/rterror.h