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

Comparing ray/src/util/Rmakefile (file contents):
Revision 2.61 by greg, Thu Jun 14 22:42:21 2012 UTC vs.
Revision 2.80 by greg, Fri Feb 13 20:49:59 2015 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
23 >                vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
24 >                eplus_adduvf rfluxmtx rmtxop wrapBSDF
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.csh objpict.csh glare.csh dayfact.csh \
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 $(LIBFILES)
36          cp $(PROGS) $(INSTDIR)
37 <        cp objview.csh $(INSTDIR)/objview
37 >        cp objview.pl $(INSTDIR)/objview
38          cp objline.csh $(INSTDIR)/objline
39 <        cp objpict.csh $(INSTDIR)/objpict
39 >        cp objpict.pl $(INSTDIR)/objpict
40          cp glare.csh $(INSTDIR)/glare
41          cp dayfact.csh $(INSTDIR)/dayfact
42          cp debugcal.csh $(INSTDIR)/debugcal
# 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 ltview.pl $(INSTDIR)/ltview
53 +        cp ltpict.pl $(INSTDIR)/ltpict
54          cd $(INSTDIR) ; chmod 755 objview objpict \
55                  glare dayfact debugcal rlux raddepend objline \
56                  compamb vinfo genambpos fieldcomb genklemsamp \
57                  genskyvec genBSDF
58 <        cp tregsamp.dat $(LIBDIR)
58 >        cd $(LIBDIR) && rm -f $(LIBFILES)
59 >        cp $(LIBFILES) $(LIBDIR)
60          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
61  
62   clean:
63 <        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
63 >        set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
64  
65   ogl:    glrad
66          cp glrad $(INSTDIR)
# Line 88 | Line 97 | rsensor:       rsensor.o
97   rpiece: rpiece.o Version.o
98          $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
99  
91 rtcontrib:      rtcontrib.o Version.o
92        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
93
100   vwright:        vwright.o
101          $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
102  
# Line 104 | Line 110 | glrad: glrad.o
110          $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
111   -lX11 -lXext $(MLIB)
112  
113 < dctimestep:     dctimestep.o
114 <        $(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
113 > dctimestep:     dctimestep.o cmbsdf.o cmatrix.o
114 >        $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
115 > -lrtrad $(MLIB)
116  
117   rttree_reduce:  rttree_reduce.o
118          $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
119  
120 + rcollate:       rcollate.o
121 +        $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
122 +
123 + eplus_adduvf:   eplus_adduvf.o eplus_idf.o
124 +        $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
125 + -lrtrad $(MLIB)
126 +
127 + rfluxmtx:       rfluxmtx.o
128 +        $(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB)
129 +
130 + rmtxop: rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
131 +        $(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
132 + -lrtrad $(MLIB)
133 +
134 + wrapBSDF:       wrapBSDF.o
135 +        $(CC) $(CFLAGS) -o wrapBSDF wrapBSDF.o -lrtrad $(MLIB)
136 +
137   setscan.o:      setscan.h
138  
139 + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \
140 + ../common/paths.h ../common/rtio.h ../common/random.h \
141 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h
142 +
143 + eplus_adduvf.o eplus_idf.o:     eplus_idf.h \
144 + ../common/lookup.h
145 +
146   findglare.o glareval.o \
147   glaresrc.o:     glare.h ../common/standard.h \
148   ../common/rtmisc.h ../common/rtio.h \
# Line 125 | Line 156 | rpiece.o:      ../common/color.h ../common/view.h ../common
156   dctimestep.o:   ../common/standard.h \
157   ../common/rtmisc.h ../common/rtio.h \
158   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
159 < ../common/rterror.h ../common/platform.h ../common/paths.h \
129 < ../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
159 > ../common/rterror.h ../common/resolu.h
160  
161 < rtcontrib.o:    ../common/platform.h ../common/rtprocess.h \
132 < ../common/color.h ../common/resolu.h ../common/lookup.h \
133 < ../common/calcomp.h ../common/selcall.h
161 > dctimestep.o cmatrix.o cmbsdf.o:        cmatrix.h ../common/color.h
162  
163 < rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:      ../common/standard.h \
163 > cmatrix.o cmbsdf.o:     ../common/standard.h \
164   ../common/rtmisc.h ../common/rtio.h \
165   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
166   ../common/rterror.h
167  
168 + cmbsdf.o:       ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
169 +
170 + rfluxmtx.o:     ../common/rtio.h ../common/random.h ../common/triangulate.h \
171 + ../common/rtmath.h ../common/fvect.h ../common/mat4.h ../common/tiff.h \
172 + ../common/platform.h ../common/bsdf.h ../common/bsdf_m.h ../common/rtprocess.h
173 +
174 + dctimestep.o cmatrix.o: ../common/platform.h
175 +
176 + rad.o ranimate.o rpiece.o xglaresrc.o:  ../common/standard.h \
177 + ../common/rtmisc.h ../common/rtio.h \
178 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
179 + ../common/rterror.h
180 +
181   xglaresrc.o:    ../common/view.h
182  
183   glareval.o xglaresrc.o: ../common/resolu.h
# Line 180 | Line 221 | rsensor.o:     ../rt/ray.h ../common/octree.h \
221  
222   rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
223  
224 + rcollate.o:     ../common/platform.h ../common/rtio.h ../common/resolu.h
225 +
226   Version.c:      ../rt/Version.c
227          cp ../rt/Version.c .
228  
# Line 187 | Line 230 | x11findwind.c: ../common/x11findwind.c
230          cp ../common/x11findwind.c .
231  
232   rttree_reduce.o:        ../common/rtio.h ../common/rterror.h
233 +
234 + rmatrix.o:      rmatrix.h cmatrix.h ../common/resolu.h
235 +
236 + rmtxop.o:       rmatrix.h cmatrix.h ../common/rtio.h ../common/resolu.h
237 +
238 + wrapBSDF.o:     ../common/rtio.h ../common/rtprocess.h ../common/ezxml.h \
239 + ../common/bsdf.h ../common/bsdf_m.h ../common/fvect.h ../common/ccolor.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines