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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.56 by greg, Tue Jun 24 02:01:21 2008 UTC vs.
Revision 2.75 by greg, Fri Aug 21 01:57:56 2015 UTC

# Line 54 | Line 54 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
54   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
55   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
56  
57 < RLOBJS = raycalls.o raypcalls.o
58 < RLSRC = raycalls.c raypcalls.c
57 > RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
58 > RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
59  
60 + RLOBJS = raycalls.o raypcalls.o rayfifo.o
61 + RLSRC = raycalls.c raypcalls.c rayfifo.c
62 +
63   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
64 <        $(MODOBJS) $(SUPPOBJS)
64 >        $(MODOBJS) $(SUPPOBJS) $(PMOBJS)
65   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
66 <        $(MODSRC) $(SUPPSRC)
66 >        $(MODSRC) $(SUPPSRC) $(PMSRC)
67  
68   RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
69          preload.o raytrace.o renderopts.o
# Line 73 | Line 76 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
76          o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
77  
78   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
79 <        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
79 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
80 >        ashikhmin.o
81   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
82 <        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
82 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
83 >        ashikhmin.c
84  
85   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
86   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 83 | Line 88 | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx
88   SUPPOBJS = func.o noise3.o data.o
89   SUPPSRC = func.c noise3.c data.c
90  
91 + PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
92 +         pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
93 +         pmapdiag.o pmaptype.o
94 + PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
95 +        pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
96 +        pmapdiag.c pmaptype.c
97 +
98   HEADERS = ambient.h ray.h data.h otspecial.h source.h
99  
100   #
101   # What this makefile produces:
102   #
103  
104 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
104 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
105 > $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
106  
107   all:    $(PROGS) $(RCLIB) $(SPECIAL)
108  
109   install:        all rayinit.cal
110          $(INSTALL) $(PROGS) $(INSTDIR)
111          cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
112 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
113          rm -f $(LIBDIR)/rayinit.cal
114          cp rayinit.cal $(LIBDIR)
115  
116   ogl:    
117  
118   clean:
119 <        set nonomatch; rm -f $(PROGS) *.o core
119 >        set nonomatch; rm -f $(PROGS) *.o
120  
121   lint:   $(RVSRC)
122          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 111 | Line 125 | lint:  $(RVSRC)
125   # Links:
126   #
127  
128 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
129 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
128 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
129 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
130  
131   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
132          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
133  
134 < $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
135 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
134 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
135 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
136 > $(RLIB) $(LIBS) $(DLIBS)
137  
138 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
139 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
140 +
141   $(DESTDIR)/lookamb:     lookamb.o ambio.o
142          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
143  
144 + $(DESTDIR)/mkpmap: mkpmap.o $(RLIB)
145 +        $(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS)
146 +
147 + $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
148 +        $(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(LIBS)
149 +
150   $(RLIB):        $(ROBJS) Version.o
151 +        rm -f $(RLIB)
152          ar rc $(RLIB) $(ROBJS) Version.o
153          -ranlib $(RLIB)
154  
155   $(RCLIB):       $(RLOBJS)
156 +        rm -f $(RCLIB)
157          ar rc $(RCLIB) $(RLOBJS)
158          -ranlib $(RCLIB)
159  
# Line 172 | Line 198 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
198  
199   o_instance.o:   ../common/instance.h
200  
201 < ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
202 < m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
201 > ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
202 > initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
203   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
204   srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
205  
206 < ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
207 < rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
206 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
207 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
208   srcsamp.o virtuals.o:   ../common/random.h
209  
210 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
211 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
212 < mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
213 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
210 > ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
211 > glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
212 > o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
213 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
214   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
215 < text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
215 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
216 > rcontrib.o rc2.o rc3.o: ray.h \
217   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
218   ../common/rterror.h ../common/octree.h \
219   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 209 | Line 236 | initotypes.o srcobstr.o raytrace.o:    otspecial.h
236   rpmain.o rtmain.o rvmain.o rpict.o \
237   srcdraw.o:      ../common/view.h ../common/resolu.h
238  
239 + rpict.o:        ../common/hilbert.h
240 +
241   x11.o x11twind.o: x11twind.h
242  
243   x11.o:  x11icon.h
# Line 221 | Line 250 | rv2.o: ../common/resolu.h
250   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
251   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
252  
253 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
254 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
253 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
254 > ../common/cone.h ../common/instance.h ../common/mesh.h \
255 > ../common/color.h ../common/bsdf.h ../common/otypes.h
256  
257   rtmain.o rpmain.o rvmain.o persist.o duphead.o \
258   renderopts.o rpict.o:   ../common/paths.h
# Line 235 | Line 265 | o_mesh.o:      ../common/mesh.h
265  
266   noise3.o:       ../common/calcomp.h
267  
268 < aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
268 > aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \
269   m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
270   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
271   o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
272   srcobstr.o text.o:              rtotypes.h
273 +
274 + m_bsdf.o:       ambient.h source.h func.h \
275 + ../common/calcomp.h ../common/bsdf.h ../common/random.h
276 +
277 + rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \
278 + ../common/platform.h ../common/paths.h ../common/lookup.h \
279 + func.h ../common/calcomp.h ../common/rtprocess.h
280 +
281 + rcmain.o:       source.h ambient.h
282 +
283 + rcontrib.o:     source.h ../common/otypes.h
284 +
285 + rc2.o:  ../common/resolu.h
286 +
287 + rc3.o:  ../common/selcall.h
288 +
289 + #
290 + # Photon map include dependencies (via 'gcc -MM -I../common')
291 + #
292 +
293 +
294 + ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
295 +
296 + dielectric.o glass.o normal.o: \
297 +   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
298 +  
299 + raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
300 +   pmapparm.h pmaptype.h pmapray.h
301 +  
302 + rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h
303 +  
304 + raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h
305 +
306 + renderopts.o: pmapparm.h pmaptype.h pmapopt.h
307 +
308 + rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h
309 +
310 + source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h
311 +
312 + pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \
313 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
314 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
315 + ../common/rterror.h ../common/octree.h ../common/object.h \
316 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h
317 +
318 + pmapbias.o: pmapbias.c pmapbias.h pmapdata.h ray.h ../common/standard.h \
319 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
320 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
321 + ../common/rterror.h ../common/octree.h ../common/object.h \
322 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h \
323 + pmaprand.h
324 +
325 + pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
326 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
327 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
328 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
329 + ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \
330 + pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
331 + ../common/platform.h ../common/otypes.h
332 +
333 + pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
334 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
335 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
336 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
337 + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
338 + ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
339 + pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
340 + ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
341 + ../common/otypes.h
342 +
343 + pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
344 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
345 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
346 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
347 + ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
348 + pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \
349 + ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \
350 + ../common/calcomp.h
351 +
352 + pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
353 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
354 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
355 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
356 + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
357 + ../common/lookup.h
358 +
359 + pmapdump.o: pmapdump.c pmapio.h pmapdata.h ray.h ../common/standard.h \
360 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
361 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
362 + ../common/rterror.h ../common/octree.h ../common/object.h \
363 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h \
364 + ../common/rtio.h ../common/resolu.h
365 +
366 + pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common/standard.h \
367 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
368 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
369 + ../common/rterror.h ../common/octree.h ../common/object.h \
370 + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
371 + ../common/platform.h ../common/resolu.h
372 +
373 + pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
374 + ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
375 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
376 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
377 + ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
378 + ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
379 + ../common/ccolor.h
380 +
381 + pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
382 + ../common/rterror.h
383 +
384 + pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.h ray.h \
385 + ../common/standard.h ../common/copyright.h ../common/rtio.h \
386 + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
387 + ../common/fvect.h ../common/rterror.h ../common/octree.h \
388 + ../common/object.h ../common/color.h ../common/lookup.h
389 +
390 + pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
391 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
392 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
393 + ../common/rterror.h ../common/octree.h ../common/object.h \
394 + ../common/color.h pmapparm.h pmaptype.h pmap.h pmapdata.h \
395 + ../common/lookup.h
396 +
397 + pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \
398 + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
399 + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \
400 + ../common/rterror.h ../common/octree.h ../common/object.h \
401 + ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
402 + ../common/lookup.h pmaprand.h ../common/otypes.h
403 +
404 + pmaptype.o: pmaptype.c pmaptype.h
405 +

Diff Legend

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