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.73 by greg, Sat Apr 26 15:59:38 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 + LIBFILES = rambpos.cal ambpos.cal tregsamp.dat
27 +
28   all:    $(PROGS)
29  
30 < install:        all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
30 > install:        all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
31   rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
32 < genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.pl genBSDF.pl tregsamp.dat
32 > ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \
33 > genskyvec.pl genBSDF.pl $(LIBFILES)
34          cp $(PROGS) $(INSTDIR)
35 <        cp objview.csh $(INSTDIR)/objview
35 >        cp objview.pl $(INSTDIR)/objview
36          cp objline.csh $(INSTDIR)/objline
37 <        cp objpict.csh $(INSTDIR)/objpict
37 >        cp objpict.pl $(INSTDIR)/objpict
38          cp glare.csh $(INSTDIR)/glare
39          cp dayfact.csh $(INSTDIR)/dayfact
40          cp debugcal.csh $(INSTDIR)/debugcal
# Line 38 | Line 42 | genambpos.csh fieldcomb.csh genklemsamp.pl genskyvec.p
42          cp raddepend.csh $(INSTDIR)/raddepend
43          cp compamb.csh $(INSTDIR)/compamb
44          cp vinfo.csh $(INSTDIR)/vinfo
45 <        cp genambpos.csh $(INSTDIR)/genambpos
45 >        cp genambpos.pl $(INSTDIR)/genambpos
46          cp fieldcomb.csh $(INSTDIR)/fieldcomb
47          cp genklemsamp.pl $(INSTDIR)/genklemsamp
48          cp genskyvec.pl $(INSTDIR)/genskyvec
49          cp genBSDF.pl $(INSTDIR)/genBSDF
50 +        cp ltview.pl $(INSTDIR)/ltview
51 +        cp ltpict.pl $(INSTDIR)/ltpict
52          cd $(INSTDIR) ; chmod 755 objview objpict \
53                  glare dayfact debugcal rlux raddepend objline \
54                  compamb vinfo genambpos fieldcomb genklemsamp \
55                  genskyvec genBSDF
56 <        cp tregsamp.dat $(LIBDIR)
56 >        cd $(LIBDIR) && rm -f $(LIBFILES)
57 >        cp $(LIBFILES) $(LIBDIR)
58          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
59  
60   clean:
61 <        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
61 >        set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
62  
63   ogl:    glrad
64          cp glrad $(INSTDIR)
# Line 88 | Line 95 | rsensor:       rsensor.o
95   rpiece: rpiece.o Version.o
96          $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
97  
91 rtcontrib:      rtcontrib.o Version.o
92        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
93
98   vwright:        vwright.o
99          $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
100  
# Line 104 | Line 108 | glrad: glrad.o
108          $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
109   -lX11 -lXext $(MLIB)
110  
111 < dctimestep:     dctimestep.o
112 <        $(CC) $(CFLAGS) -o dctimestep dctimestep.o -lrtrad $(MLIB)
111 > dctimestep:     dctimestep.o cmbsdf.o cmatrix.o
112 >        $(CC) $(CFLAGS) -o dctimestep dctimestep.o cmbsdf.o cmatrix.o \
113 > -lrtrad $(MLIB)
114  
115   rttree_reduce:  rttree_reduce.o
116          $(CC) $(CFLAGS) -o rttree_reduce rttree_reduce.o -lrtrad $(MLIB)
117  
118 + rcollate:       rcollate.o
119 +        $(CC) $(CFLAGS) -o rcollate rcollate.o -lrtrad
120 +
121 + eplus_adduvf:   eplus_adduvf.o eplus_idf.o
122 +        $(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
123 + -lrtrad $(MLIB)
124 +
125   setscan.o:      setscan.h
126  
127 + eplus_adduvf.o: ../common/triangulate.h ../common/rtprocess.h \
128 + ../common/paths.h ../common/rtio.h ../common/random.h \
129 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h
130 +
131 + eplus_adduvf.o eplus_idf.o:     eplus_idf.h \
132 + ../common/lookup.h
133 +
134   findglare.o glareval.o \
135   glaresrc.o:     glare.h ../common/standard.h \
136   ../common/rtmisc.h ../common/rtio.h \
# Line 125 | Line 144 | rpiece.o:      ../common/color.h ../common/view.h ../common
144   dctimestep.o:   ../common/standard.h \
145   ../common/rtmisc.h ../common/rtio.h \
146   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
147 < ../common/rterror.h ../common/platform.h ../common/paths.h \
129 < ../common/color.h ../common/bsdf.h ../common/bsdf_m.h ../common/resolu.h
147 > ../common/rterror.h ../common/resolu.h
148  
149 < 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
149 > dctimestep.o cmatrix.o cmbsdf.o:        cmatrix.h ../common/color.h
150  
151 < rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:      ../common/standard.h \
151 > cmatrix.o cmbsdf.o:     ../common/standard.h \
152   ../common/rtmisc.h ../common/rtio.h \
153   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
154   ../common/rterror.h
155  
156 + cmbsdf.o:       ../common/paths.h ../common/bsdf.h ../common/bsdf_m.h
157 +
158 + dctimestep.o cmatrix.o: ../common/platform.h
159 +
160 + rad.o ranimate.o rpiece.o xglaresrc.o:  ../common/standard.h \
161 + ../common/rtmisc.h ../common/rtio.h \
162 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
163 + ../common/rterror.h
164 +
165   xglaresrc.o:    ../common/view.h
166  
167   glareval.o xglaresrc.o: ../common/resolu.h
# Line 179 | Line 204 | rsensor.o:     ../rt/ray.h ../common/octree.h \
204   ../common/rterror.h
205  
206   rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
207 +
208 + rcollate.o:     ../common/platform.h ../common/rtio.h ../common/resolu.h
209  
210   Version.c:      ../rt/Version.c
211          cp ../rt/Version.c .

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines