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.40 by greg, Mon Nov 10 16:52:24 2003 UTC vs.
Revision 2.71 by greg, Tue Feb 18 12:13:42 2014 UTC

# Line 6 | Line 6
6   OPT = -O
7   MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9 < SPECIAL = aed
9 > SPECIAL =
10   CC = cc
11   MLIB = -lm
12   LINT = lint
# Line 30 | Line 30 | LIBDIR = /usr/local/lib/ray
30   #
31   RLIB = ../lib/libradiance.a
32   RCLIB = ../lib/libraycalls.a
33 < LIBS = -lrt $(MLIB)
33 > LIBS = -lrtrad $(MLIB)
34  
35   #
36 < # Device drivers for rview (see also devtable.c):
36 > # Device drivers for rvu (see also devtable.c):
37   #
38   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
39          colortab.o
# 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)
65   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
# Line 67 | Line 70 | RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o ini
70   RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \
71          preload.c raytrace.c renderopts.c
72  
73 < SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
74 <        o_cone.o o_instance.o o_mesh.o
75 < SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
76 <        srcsamp.c o_cone.c o_instance.c o_mesh.c
73 > SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
74 >        o_face.o o_cone.o o_instance.o o_mesh.o
75 > SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
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 89 | Line 94 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
94   # What this makefile produces:
95   #
96  
97 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
97 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
98 > $(DESTDIR)/lookamb
99  
100   all:    $(PROGS) $(RCLIB) $(SPECIAL)
101  
102   install:        all rayinit.cal
103          $(INSTALL) $(PROGS) $(INSTDIR)
104 +        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
105 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
106          rm -f $(LIBDIR)/rayinit.cal
107          cp rayinit.cal $(LIBDIR)
108  
101 aed:    $(DEVDIR)/aed
102
109   ogl:    
110  
111   clean:
# Line 112 | Line 118 | lint:  $(RVSRC)
118   # Links:
119   #
120  
121 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
122 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
121 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
122 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
123  
124   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
125          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
126  
127 < $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
128 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
127 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
128 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
129 > $(RLIB) $(LIBS) $(DLIBS)
130  
131 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
132 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
133 +
134   $(DESTDIR)/lookamb:     lookamb.o ambio.o
135          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
136  
127 $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
128        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
129 devmain.o tty.o editline.o $(LIBS)
130
137   $(RLIB):        $(ROBJS) Version.o
138 +        rm -f $(RLIB)
139          ar rc $(RLIB) $(ROBJS) Version.o
140          -ranlib $(RLIB)
141  
142   $(RCLIB):       $(RLOBJS)
143 +        rm -f $(RCLIB)
144          ar rc $(RCLIB) $(RLOBJS)
145          -ranlib $(RCLIB)
146  
147   #
140 # Special compiles:
141 #
142
143 rtmain.o:       rtmain.c
144        $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
145
146 rpmain.o:       rpmain.c
147        $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
148
149 rvmain.o:       rvmain.c
150        $(CC) $(CFLAGS) -c rvmain.c
151
152 #
148   # Uncomment the following to model dispersion:
149   #
150   dielectric.o:   dielectric.c source.h
# Line 160 | Line 155 | dielectric.o:  dielectric.c source.h
155   devcomm.o:      devcomm.c
156          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
157  
163 aed.o:  aed.c
164        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
165
158   #
159   # Version module:
160   #
# Line 175 | Line 167 | Version.c:     VERSION $(RSRC) $(HEADERS)
167   # Include dependencies:
168   #
169  
170 < aed.o ambio.o colortab.o data.o devcomm.o \
170 > ambio.o colortab.o data.o devcomm.o \
171   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
172  
173   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
# Line 183 | Line 175 | freeobjmem.o o_cone.o srcsupp.o:       ../common/cone.h
175   data.o freeobjmem.o m_brdf.o mx_data.o \
176   p_data.o raycalls.o t_data.o:   data.h
177  
178 < aed.o devcomm.o devmain.o devtable.o \
179 < editline.o tty.o x11.o: driver.h
178 > devcomm.o devmain.o devtable.o \
179 > editline.o x11.o:       driver.h
180  
181   freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
182  
183   ambient.o raytrace.o rpmain.o rtmain.o \
184 < rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
184 > rtrace.o rvmain.o rv2.o rv3.o:  ../common/octree.h
185  
186   o_instance.o:   ../common/instance.h
187  
188 < ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
189 < m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
188 > ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
189 > initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
190   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
191 < virtuals.o:     ../common/otypes.h
191 > srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
192  
193 < ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
194 < rtmain.o rpmain.o persist.o source.o rv3.o \
193 > ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
194 > rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
195   srcsamp.o virtuals.o:   ../common/random.h
196  
197 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
198 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
199 < mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
200 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
201 < source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
202 < rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:        ray.h \
197 > ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
198 > glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
199 > o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
200 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
201 > source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
202 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
203 > rcontrib.o rc2.o rc3.o: ray.h \
204   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
205   ../common/rterror.h ../common/octree.h \
206   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 215 | Line 208 | rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:       ray.h
208   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
209  
210   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
211 < source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
211 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
212 > srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
213  
214   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
215   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
# Line 224 | Line 218 | duphead.o octree.o:    ../common/standard.h ../common/rtm
218  
219   ambio.o:        ../common/fvect.h
220  
221 < initotypes.o raytrace.o:        otspecial.h
221 > initotypes.o srcobstr.o raytrace.o:     otspecial.h
222  
223   rpmain.o rtmain.o rvmain.o rpict.o \
224   srcdraw.o:      ../common/view.h ../common/resolu.h
225  
226 + rpict.o:        ../common/hilbert.h
227 +
228   x11.o x11twind.o: x11twind.h
229  
230   x11.o:  x11icon.h
# Line 241 | Line 237 | rv2.o: ../common/resolu.h
237   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
238   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
239  
240 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
241 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
240 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
241 > ../common/cone.h ../common/instance.h ../common/mesh.h \
242 > ../common/color.h ../common/bsdf.h ../common/otypes.h
243  
244 < devcomm.o:      ../common/paths.h
244 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
245 > renderopts.o rpict.o:   ../common/paths.h
246  
249 rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
250
247   freeobjmem.o raycalls.o text.o: ../common/font.h
248  
249   raypcalls.o:    ../common/selcall.h
# Line 255 | Line 251 | raypcalls.o:   ../common/selcall.h
251   o_mesh.o:       ../common/mesh.h
252  
253   noise3.o:       ../common/calcomp.h
254 +
255 + aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \
256 + m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
257 + mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
258 + o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
259 + srcobstr.o text.o:              rtotypes.h
260 +
261 + m_bsdf.o:       ambient.h source.h func.h \
262 + ../common/calcomp.h ../common/bsdf.h ../common/random.h
263 +
264 + rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \
265 + ../common/platform.h ../common/paths.h ../common/lookup.h \
266 + func.h ../common/calcomp.h ../common/rtprocess.h
267 +
268 + rcmain.o:       source.h ambient.h
269 +
270 + rcontrib.o:     source.h ../common/otypes.h
271 +
272 + rc2.o:  ../common/resolu.h
273 +
274 + rc3.o:  ../common/selcall.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines