--- ray/src/util/Rmakefile 2022/06/01 17:22:31 2.101 +++ ray/src/util/Rmakefile 2023/12/12 16:31:45 2.104 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.101 2022/06/01 17:22:31 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.104 2023/12/12 16:31:45 greg Exp $ # # Radiance makefile for utility programs # @@ -15,6 +15,8 @@ CC = cc SPECIAL = +INSTALL = cp + INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray @@ -22,7 +24,7 @@ LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \ eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare radcompare \ - rcode_depth rcode_norm rcode_ident dcglare rcrop + rcode_depth rcode_norm rcode_ident dcglare rcrop rcomb LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \ klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \ @@ -34,7 +36,7 @@ install: all $(SPECIAL) objview.pl objpict.pl glare.cs rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \ ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \ genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl rcode2bmp.pl $(LIBFILES) - cp $(PROGS) $(INSTDIR) + $(INSTALL) $(PROGS) $(INSTDIR) cp objview.pl $(INSTDIR)/objview cp objline.csh $(INSTDIR)/objline cp objpict.pl $(INSTDIR)/objpict @@ -134,6 +136,10 @@ rfluxmtx: rfluxmtx.o rmtxop: rmtxop.o rmatrix.o cmatrix.o cmbsdf.o $(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \ +-lrtrad $(MLIB) + +rcomb: rcomb.o rmatrix.o cmatrix.o cmbsdf.o + $(CC) $(CFLAGS) -o rcomb rcomb.o rmatrix.o cmatrix.o cmbsdf.o \ -lrtrad $(MLIB) wrapBSDF: wrapBSDF.o