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.78 by greg, Mon Jul 28 16:30:18 2014 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
25  
26 + LIBFILES = rambpos.cal ambpos.cal tregsamp.dat reinhartb.cal \
27 + klems_full.cal klems_half.cal klems_quarter.cal disk2square.cal
28 +
29   all:    $(PROGS)
30  
31 < install:        all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
31 > install:        all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
32   rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
33 < genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
33 > ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \
34 > genskyvec.pl genBSDF.pl $(LIBFILES)
35          cp $(PROGS) $(INSTDIR)
36 <        cp objview.csh $(INSTDIR)/objview
36 >        cp objview.pl $(INSTDIR)/objview
37          cp objline.csh $(INSTDIR)/objline
38 <        cp objpict.csh $(INSTDIR)/objpict
38 >        cp objpict.pl $(INSTDIR)/objpict
39          cp glare.csh $(INSTDIR)/glare
40          cp dayfact.csh $(INSTDIR)/dayfact
41          cp debugcal.csh $(INSTDIR)/debugcal
# Line 38 | Line 43 | genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
43          cp raddepend.csh $(INSTDIR)/raddepend
44          cp compamb.csh $(INSTDIR)/compamb
45          cp vinfo.csh $(INSTDIR)/vinfo
46 <        cp genambpos.csh $(INSTDIR)/genambpos
46 >        cp genambpos.pl $(INSTDIR)/genambpos
47          cp fieldcomb.csh $(INSTDIR)/fieldcomb
48          cp genklemsamp.pl $(INSTDIR)/genklemsamp
49          cp genskyvec.pl $(INSTDIR)/genskyvec
50          cp genBSDF.pl $(INSTDIR)/genBSDF
51 +        cp ltview.pl $(INSTDIR)/ltview
52 +        cp ltpict.pl $(INSTDIR)/ltpict
53          cd $(INSTDIR) ; chmod 755 objview objpict \
54                  glare dayfact debugcal rlux raddepend objline \
55                  compamb vinfo genambpos fieldcomb genklemsamp \
56                  genskyvec genBSDF
57 <        cp tregsamp.dat $(LIBDIR)
57 >        cd $(LIBDIR) && rm -f $(LIBFILES)
58 >        cp $(LIBFILES) $(LIBDIR)
59          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
60  
61   clean:
62 <        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
62 >        set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
63  
64   ogl:    glrad
65          cp glrad $(INSTDIR)
# Line 88 | Line 96 | rsensor:       rsensor.o
96   rpiece: rpiece.o Version.o
97          $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
98  
91 rtcontrib:      rtcontrib.o Version.o
92        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
93
99   vwright:        vwright.o
100          $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
101  
# Line 104 | Line 109 | glrad: glrad.o
109          $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
110   -lX11 -lXext $(MLIB)
111  
112 < dctimestep:     dctimestep.o
113 <        $(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
112 > dctimestep:     dctimestep.o cmbsdf.o cmatrix.o
113 >        $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
114 > -lrtrad $(MLIB)
115  
116   rttree_reduce:  rttree_reduce.o
117          $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
118  
119 + rcollate:       rcollate.o
120 +        $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
121 +
122 + eplus_adduvf:   eplus_adduvf.o eplus_idf.o
123 +        $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
124 + -lrtrad $(MLIB)
125 +
126 + rfluxmtx:       rfluxmtx.o
127 +        $(CC) $(CFLAGS) -o rfluxmtx rfluxmtx.o -lrtrad $(MLIB)
128 +
129 + rmtxop: rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
130 +        $(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
131 + -lrtrad $(MLIB)
132 +
133   setscan.o:      setscan.h
134  
135 + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \
136 + ../common/paths.h ../common/rtio.h ../common/random.h \
137 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h
138 +
139 + eplus_adduvf.o eplus_idf.o:     eplus_idf.h \
140 + ../common/lookup.h
141 +
142   findglare.o glareval.o \
143   glaresrc.o:     glare.h ../common/standard.h \
144   ../common/rtmisc.h ../common/rtio.h \
# Line 125 | Line 152 | rpiece.o:      ../common/color.h ../common/view.h ../common
152   dctimestep.o:   ../common/standard.h \
153   ../common/rtmisc.h ../common/rtio.h \
154   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
155 < ../common/rterror.h ../common/platform.h ../common/paths.h \
129 < ../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
155 > ../common/rterror.h ../common/resolu.h
156  
157 < 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
157 > dctimestep.o cmatrix.o cmbsdf.o:        cmatrix.h ../common/color.h
158  
159 < rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:      ../common/standard.h \
159 > cmatrix.o cmbsdf.o:     ../common/standard.h \
160   ../common/rtmisc.h ../common/rtio.h \
161   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
162   ../common/rterror.h
163  
164 + cmbsdf.o:       ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
165 +
166 + rfluxmtx.o:     ../common/rtio.h ../common/random.h ../common/triangulate.h \
167 + ../common/rtmath.h ../common/fvect.h ../common/mat4.h ../common/tiff.h \
168 + ../common/platform.h ../common/bsdf.h ../common/bsdf_m.h ../common/rtprocess.h
169 +
170 + dctimestep.o cmatrix.o: ../common/platform.h
171 +
172 + rad.o ranimate.o rpiece.o xglaresrc.o:  ../common/standard.h \
173 + ../common/rtmisc.h ../common/rtio.h \
174 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
175 + ../common/rterror.h
176 +
177   xglaresrc.o:    ../common/view.h
178  
179   glareval.o xglaresrc.o: ../common/resolu.h
# Line 180 | Line 217 | rsensor.o:     ../rt/ray.h ../common/octree.h \
217  
218   rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
219  
220 + rcollate.o:     ../common/platform.h ../common/rtio.h ../common/resolu.h
221 +
222   Version.c:      ../rt/Version.c
223          cp ../rt/Version.c .
224  
# Line 187 | Line 226 | x11findwind.c: ../common/x11findwind.c
226          cp ../common/x11findwind.c .
227  
228   rttree_reduce.o:        ../common/rtio.h ../common/rterror.h
229 +
230 + rmatrix.o:      rmatrix.h cmatrix.h ../common/resolu.h
231 +
232 + rmtxop.o:       rmatrix.h cmatrix.h ../common/rtio.h ../common/resolu.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines