ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/Rmakefile
(Generate patch)

Comparing ray/src/util/Rmakefile (file contents):
Revision 2.64 by greg, Mon Jan 20 21:29:04 2014 UTC vs.
Revision 2.88 by greg, Sat Nov 17 20:15:51 2018 UTC

# Line 20 | Line 20 | INSTDIR = /usr/local/bin
20   LIBDIR = /usr/local/lib/ray
21  
22   PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
23 <                vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate
23 >                vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
24 >                eplus_adduvf rfluxmtx rmtxop wrapBSDF evalglare radcompare
25  
26 + LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
27 + klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal \
28 + minimalBSDFt.xml WINDOW6BSDFt.xml
29 +
30   all:    $(PROGS)
31  
32   install:        all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
33   rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
34 < genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
34 > ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \
35 > genskyvec.pl genBSDF.pl bsdfview.pl rtpict.pl $(LIBFILES)
36          cp $(PROGS) $(INSTDIR)
37          cp objview.pl $(INSTDIR)/objview
38          cp objline.csh $(INSTDIR)/objline
# Line 38 | Line 44 | genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
44          cp raddepend.csh $(INSTDIR)/raddepend
45          cp compamb.csh $(INSTDIR)/compamb
46          cp vinfo.csh $(INSTDIR)/vinfo
47 <        cp genambpos.csh $(INSTDIR)/genambpos
47 >        cp genambpos.pl $(INSTDIR)/genambpos
48          cp fieldcomb.csh $(INSTDIR)/fieldcomb
49          cp genklemsamp.pl $(INSTDIR)/genklemsamp
50          cp genskyvec.pl $(INSTDIR)/genskyvec
51          cp genBSDF.pl $(INSTDIR)/genBSDF
52 +        cp bsdfview.pl $(INSTDIR)/bsdfview
53 +        cp ltview.pl $(INSTDIR)/ltview
54 +        cp ltpict.pl $(INSTDIR)/ltpict
55 +        cp rtpict.pl $(INSTDIR)/rtpict
56          cd $(INSTDIR) ; chmod 755 objview objpict \
57                  glare dayfact debugcal rlux raddepend objline \
58                  compamb vinfo genambpos fieldcomb genklemsamp \
59 <                genskyvec genBSDF
60 <        cp tregsamp.dat $(LIBDIR)
59 >                genskyvec genBSDF rtpict
60 >        cd $(LIBDIR) && rm -f $(LIBFILES)
61 >        cp $(LIBFILES) $(LIBDIR)
62          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
63  
64   clean:
65 <        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
65 >        set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
66  
67   ogl:    glrad
68          cp glrad $(INSTDIR)
# Line 88 | Line 99 | rsensor:       rsensor.o
99   rpiece: rpiece.o Version.o
100          $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
101  
91 – rtcontrib:      rtcontrib.o Version.o
92 –        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
93 –
102   vwright:        vwright.o
103          $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
104  
# Line 114 | Line 122 | rttree_reduce: rttree_reduce.o
122   rcollate:       rcollate.o
123          $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
124  
125 + eplus_adduvf:   eplus_adduvf.o eplus_idf.o
126 +        $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
127 + -lrtrad $(MLIB)
128 +
129 + rfluxmtx:       rfluxmtx.o
130 +        $(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB)
131 +
132 + rmtxop: rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
133 +        $(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
134 + -lrtrad $(MLIB)
135 +
136 + wrapBSDF:       wrapBSDF.o
137 +        $(CC) $(CFLAGS) -o wrapBSDF wrapBSDF.o -lrtrad $(MLIB)
138 +
139 + evalglare:      evalglare.o pictool.o
140 +        $(CC) $(CFLAGS) -o evalglare evalglare.o pictool.o -lreetz -lrtrad $(MLIB)
141 +
142 + radcompare:     radcompare.o
143 +        $(CC) $(CFLAGS) -o radcompare radcompare.o -lrtrad $(MLIB)
144 +
145   setscan.o:      setscan.h
146  
147 + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \
148 + ../common/paths.h ../common/rtio.h ../common/random.h \
149 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h
150 +
151 + eplus_adduvf.o eplus_idf.o:     eplus_idf.h \
152 + ../common/lookup.h
153 +
154   findglare.o glareval.o \
155   glaresrc.o:     glare.h ../common/standard.h \
156   ../common/rtmisc.h ../common/rtio.h \
# Line 140 | Line 175 | cmatrix.o cmbsdf.o:    ../common/standard.h \
175  
176   cmbsdf.o:       ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
177  
178 < dctimestep.o cmatrix.o: ../common/platform.h
178 > rfluxmtx.o:     ../common/rtio.h ../common/random.h ../common/triangulate.h \
179 > ../common/rtmath.h ../common/fvect.h ../common/mat4.h ../common/tiff.h \
180 > ../common/platform.h ../common/bsdf.h ../common/bsdf_m.h ../common/rtprocess.h
181  
182 < rtcontrib.o:    ../common/platform.h ../common/rtprocess.h \
146 < ../common/color.h ../common/resolu.h ../common/lookup.h \
147 < ../common/calcomp.h ../common/selcall.h
182 > rmtxop.o dctimestep.o cmatrix.o:        ../common/platform.h
183  
184 < rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:      ../common/standard.h \
184 > rad.o ranimate.o rpiece.o xglaresrc.o:  ../common/standard.h \
185   ../common/rtmisc.h ../common/rtio.h \
186   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
187   ../common/rterror.h
# Line 165 | Line 200 | rad.o: ../common/paths.h
200  
201   ranimate.o netproc.o:   netproc.h
202  
203 < ranimove1.o:    ../common/otypes.h
203 > ranimove1.o:    ../common/otypes.h ../rt/otspecial.h ../rt/source.h
204  
205   netproc.o:      ../common/paths.h
206  
# Line 194 | Line 229 | rsensor.o:     ../rt/ray.h ../common/octree.h \
229  
230   rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
231  
232 < rcollate.o:     ../common/platform.h ../common/rtio.h ../common/resolu.h
232 > radcompare.o rcollate.o:        ../common/platform.h \
233 > ../common/rtio.h ../common/resolu.h
234  
235   Version.c:      ../rt/Version.c
236          cp ../rt/Version.c .
# Line 203 | Line 239 | x11findwind.c: ../common/x11findwind.c
239          cp ../common/x11findwind.c .
240  
241   rttree_reduce.o:        ../common/rtio.h ../common/rterror.h
242 +
243 + rmatrix.o:      rmatrix.h cmatrix.h ../common/resolu.h
244 +
245 + rmtxop.o:       rmatrix.h cmatrix.h ../common/rtio.h ../common/resolu.h
246 +
247 + wrapBSDF.o:     ../common/rtio.h ../common/rtprocess.h ../common/ezxml.h \
248 + ../common/bsdf.h ../common/bsdf_m.h ../common/fvect.h ../common/ccolor.h
249 +
250 + pictool.o evalglare.o:  pictool.h ../common/g3vector.h ../common/g3affine.h \
251 + ../common/g3flist.h ../common/fvect.h ../common/gbasic.h
252 +
253 + evalglare.o:    ../common/rtio.h
254 +
255 + radcompare.o:   ../common/rtio.h ../common/color.h ../common/lookup.h
256 +
257 + pictool.o:      ../common/view.h ../common/color.h
258 +
259 + getinfo.o:      ../common/rtprocess.h ../common/platform.h ../common/resolu.h

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines