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.67 by greg, Sun Feb 9 22:19:30 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
25  
26   all:    $(PROGS)
27  
28 < install:        all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
28 > install:        all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
29   rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
30   genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
31          cp $(PROGS) $(INSTDIR)
32 <        cp objview.csh $(INSTDIR)/objview
32 >        cp objview.pl $(INSTDIR)/objview
33          cp objline.csh $(INSTDIR)/objline
34 <        cp objpict.csh $(INSTDIR)/objpict
34 >        cp objpict.pl $(INSTDIR)/objpict
35          cp glare.csh $(INSTDIR)/glare
36          cp dayfact.csh $(INSTDIR)/dayfact
37          cp debugcal.csh $(INSTDIR)/debugcal
# Line 104 | Line 105 | glrad: glrad.o
105          $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
106   -lX11 -lXext $(MLIB)
107  
108 < dctimestep:     dctimestep.o
109 <        $(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
108 > dctimestep:     dctimestep.o cmbsdf.o cmatrix.o
109 >        $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
110 > -lrtrad $(MLIB)
111  
112   rttree_reduce:  rttree_reduce.o
113          $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
114  
115 + rcollate:       rcollate.o
116 +        $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
117 +
118 + eplus_adduvf:   eplus_adduvf.o eplus_idf.o
119 +        $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o -lrtrad
120 +
121   setscan.o:      setscan.h
122  
123 + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h ../common/paths.h
124 +
125 + eplus_adduvf.o eplus_idf.o:     eplus_idf.h \
126 + ../common/lookup.h
127 +
128   findglare.o glareval.o \
129   glaresrc.o:     glare.h ../common/standard.h \
130   ../common/rtmisc.h ../common/rtio.h \
# Line 125 | Line 138 | rpiece.o:      ../common/color.h ../common/view.h ../common
138   dctimestep.o:   ../common/standard.h \
139   ../common/rtmisc.h ../common/rtio.h \
140   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
141 < ../common/rterror.h ../common/platform.h ../common/paths.h \
129 < ../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
141 > ../common/rterror.h ../common/resolu.h
142  
143 + dctimestep.o cmatrix.o cmbsdf.o:        cmatrix.h ../common/color.h
144 +
145 + cmatrix.o cmbsdf.o:     ../common/standard.h \
146 + ../common/rtmisc.h ../common/rtio.h \
147 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
148 + ../common/rterror.h
149 +
150 + cmbsdf.o:       ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
151 +
152 + dctimestep.o cmatrix.o: ../common/platform.h
153 +
154   rtcontrib.o:    ../common/platform.h ../common/rtprocess.h \
155   ../common/color.h ../common/resolu.h ../common/lookup.h \
156   ../common/calcomp.h ../common/selcall.h
# Line 179 | Line 202 | rsensor.o:     ../rt/ray.h ../common/octree.h \
202   ../common/rterror.h
203  
204   rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
205 +
206 + rcollate.o:     ../common/platform.h ../common/rtio.h ../common/resolu.h
207  
208   Version.c:      ../rt/Version.c
209          cp ../rt/Version.c .

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines