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.80 by rschregle, Mon Aug 14 21:03:24 2017 UTC vs.
Revision 2.87 by greg, Tue Jan 19 23:31:47 2021 UTC

# Line 8 | Line 8 | MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9   SPECIAL =
10   CC = cc
11 + AR = ar
12   MLIB = -lm
13   LINT = lint
14   LINTFLAGS = -DBSD
# Line 110 | Line 111 | all:   $(PROGS) $(RCLIB) $(SPECIAL)
111  
112   install:        all rayinit.cal
113          $(INSTALL) $(PROGS) $(INSTDIR)
113        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
114        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
114          rm -f $(LIBDIR)/rayinit.cal
115          cp rayinit.cal $(LIBDIR)
116  
# Line 151 | Line 150 | $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
150  
151   $(RLIB):        $(ROBJS) Version.o
152          rm -f $(RLIB)
153 <        ar rc $(RLIB) $(ROBJS) Version.o
153 >        $(AR) rc $(RLIB) $(ROBJS) Version.o
154          -ranlib $(RLIB)
155  
156   $(RCLIB):       $(RLOBJS)
157          rm -f $(RCLIB)
158 <        ar rc $(RCLIB) $(RLOBJS)
158 >        $(AR) rc $(RCLIB) $(RLOBJS)
159          -ranlib $(RCLIB)
160  
161   #
# Line 176 | Line 175 | devcomm.o:     devcomm.c
175  
176   Version.c:      VERSION $(RSRC) $(HEADERS)
177          ( cat VERSION ; date ; whoami ; hostname ) > Version.c
178 <        ed - Version.c < verscript.ed
178 >        ed - Version.c < verscript.ed || rm Version.c
179  
180   #
181   # Include dependencies:
# Line 201 | Line 200 | rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h
200   o_instance.o:   ../common/instance.h
201  
202   ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
203 < initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
204 < raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
205 < srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
203 > initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
204 > preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
205 > srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:       ../common/otypes.h
206  
207   ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
208   rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
# Line 223 | Line 222 | rcontrib.o rc2.o rc3.o:        ray.h \
222   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
223  
224   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
225 < rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
225 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
226   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
227  
228   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
# Line 233 | Line 232 | duphead.o octree.o:    ../common/standard.h ../common/rtm
232  
233   ambio.o:        ../common/fvect.h
234  
235 < initotypes.o srcobstr.o raytrace.o:     otspecial.h
235 > ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
236 > pmapooc.o pmapsrc.o pmcontrib2.o \
237 > raytrace.o rtrace.o rv2.o rv3.o source.o \
238 > srcdraw.o srcobstr.o virtuals.o:        otspecial.h
239  
240   rpmain.o rtmain.o rvmain.o rpict.o \
241   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 280 | Line 282 | rcmain.o rcontrib.o rc2.o rc3.o:       rcontrib.h \
282   ../common/platform.h ../common/paths.h ../common/lookup.h \
283   func.h ../common/calcomp.h ../common/rtprocess.h
284  
285 < rcmain.o:       source.h ambient.h
285 > ambient.o rcmain.o:     ambient.h
286 >
287 > rcmain.o:       source.h
288  
289   rcontrib.o:     source.h ../common/otypes.h
290  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines