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

Comparing ray/src/hd/Rmakefile (file contents):
Revision 3.21 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 3.24 by greg, Wed Oct 27 23:23:47 2004 UTC

# Line 75 | Line 75 | $(DEVDIR)/x11h.hdi:    $(DEVDIR)/x11.hdi
75          ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
76  
77   $(DEVDIR)/x11.hdi:      rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
78 < rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
78 > rhd_qtree2r.o rhd_ctab.o holo.o
79          $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
80 < rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
80 > rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrt -lX11 -lm
81  
82   $(DEVDIR)/glx1h.hdi:    $(DEVDIR)/glx1.hdi
83          rm -f $(DEVDIR)/glx1h.hdi
# Line 116 | Line 116 | $(DEVDIR)/oglsoh.hdi:  $(DEVDIR)/oglso.hdi
116          ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
117  
118   $(DEVDIR)/glx1.hdi:     rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
119 < rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
119 > rhd_qtree.o rhd_qtree2c.o holo.o
120          rm -f $(DEVDIR)/glx1.hdi
121          $(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
122 < viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
122 > viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrt -lGLU -lGL -lX11 -lm
123  
124   $(DEVDIR)/glx.hdi:      rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
125   sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
126 < sm_ogl.o sm.o sm_usets.o dircode.o holo.o
126 > sm_ogl.o sm.o sm_usets.o holo.o
127          rm -f $(DEVDIR)/glx.hdi
128          $(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
129   viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
130 < sm_ogl.o sm.o sm_usets.o dircode.o -lrt -lGLU -lGL -lX11 -lm
130 > sm_ogl.o sm.o sm_usets.o -lrt -lGLU -lGL -lX11 -lm
131  
132   $(DEVDIR)/glxo.hdi:     rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
133   sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
134 < sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
134 > sm_ogl.o sm_usets.o sm.o holo.o rhdobj.o
135          rm -f $(DEVDIR)/glxo.hdi
136          $(CC) $(CFLAGS) -o $(DEVDIR)/glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
137   viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
138 < sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
138 > sm_ogl.o sm_usets.o sm.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
139  
140   $(DEVDIR)/glxs.hdi:     rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
141   sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
142 < sm_ogl.o sm_usets.o sm.o dircode.o holo.o
142 > sm_ogl.o sm_usets.o sm.o holo.o
143          rm -f $(DEVDIR)/glxs.hdi
144          $(CC) $(CFLAGS) -o $(DEVDIR)/glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
145   viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
146 < sm_ogl.o sm_usets.o sm.o dircode.o -lrt -lGLU -lGL -lX11 -lXext -lm
146 > sm_ogl.o sm_usets.o sm.o -lrt -lGLU -lGL -lX11 -lXext -lm
147  
148   $(DEVDIR)/glxso.hdi:    rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
149   sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
150 < sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
150 > sm_ogl.o sm_usets.o sm.o holo.o rhdobj.o
151          rm -f $(DEVDIR)/glxso.hdi
152          $(CC) $(CFLAGS) -o $(DEVDIR)/glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
153   viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
154 < sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o \
154 > sm_ogl.o sm_usets.o sm.o rhdobj.o \
155   -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
156  
157   $(DEVDIR)/ogl.hdi:      rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
# Line 228 | Line 228 | holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrh
228   rhcopy.o rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
229   rhinfo.o clumpbeams.o rhoptimize.o rhpict.o rhpict2.o:  holo.h \
230   ../common/vars.h ../common/color.h \
231 < ../common/standard.h ../common/mat4.h ../common/fvect.h
231 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
232 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
233 > ../common/rterror.h ../common/tifftypes.h
234  
235   rhcopy.o:       ../common/resolu.h ../common/view.h
236  
237   rhd_x11.o rhd_qtree.o rhd_sets.o rhd_qtree2r.o rhd_odraw.o rhd_ogl0.o \
238   rhd_oglo.o rhd_ogls.o rhd_oglso.o:      ../common/standard.h \
239 < ../common/mat4.h ../common/fvect.h
239 > ../common/rtmisc.h ../common/rtio.h \
240 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
241 > ../common/rterror.h
242  
243   rhd_x11.o rhd_qtree.o rhd_qtree2r.o:    rhd_qtree.h rhdriver.h \
244   ../common/view.h ../common/tonemap.h ../common/color.h
# Line 243 | Line 247 | rhd_x11.o:     x11icon.h
247  
248   rhd_glx0.o rhd_glxo.o rhd_glxs.o rhd_glxso.o:   rhd_sample.h rhdriver.h \
249   x11icon.h ../common/tonemap.h ../common/view.h \
250 < ../common/standard.h ../common/mat4.h ../common/fvect.h
250 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
251 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
252 > ../common/rterror.h
253  
254   rhd_glxo.o rhd_glxso.o rhdobj.o:        rhdobj.h
255  
256   rhdobj.o:       rhdisp.h rhdriver.h ../common/view.h ../common/tonemap.h \
257 < ../common/radogl.h ../common/standard.h ../common/fvect.h ../common/mat4.h \
257 > ../common/radogl.h  ../common/standard.h \
258 > ../common/rtmisc.h ../common/rtio.h \
259 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
260 > ../common/rterror.h \
261   ../common/object.h ../common/otypes.h ../common/lookup.h
262  
263   sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
264   sm_ogl.o sm.o:  sm.h rhd_sample.h \
265 < ../common/standard.h ../common/mat4.h ../common/fvect.h
265 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
266 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
267 > ../common/rterror.h
268  
269   sm.o:           sm_flag.h
270  
# Line 273 | Line 284 | sm_qtree.o:    sm_flag.h sm_geom.h sm_qtree.h ../common/o
284  
285   sm_stree.o:     sm_flag.h sm_stree.h sm_qtree.h sm_geom.h ../common/object.h
286  
276 – dircode.o:      ../common/fvect.h
277 –
287   rhd_glx1.o:     rhd_qtree.h rhdriver.h x11icon.h ../common/view.h \
288 < ../common/color.h ../common/tonemap.h ../common/standard.h ../common/fvect.h \
289 < ../common/mat4.h
288 > ../common/color.h ../common/tonemap.h \
289 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
290 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
291 > ../common/rterror.h
292  
293   rhd_odraw.o rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:       rhd_odraw.h \
294   rhdriver.h ../common/view.h ../common/color.h ../common/tonemap.h
# Line 287 | Line 298 | rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:  x11icon.
298   rhd_oglo.o rhd_oglso.o: rhdobj.h
299  
300   rhd_geom.o:     rhdriver.h ../common/view.h \
301 < ../common/radogl.h ../common/standard.h ../common/fvect.h \
302 < ../common/mat4.h ../common/object.h ../common/otypes.h ../common/lookup.h
301 > ../common/radogl.h ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
302 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
303 > ../common/rterror.h ../common/object.h ../common/otypes.h ../common/lookup.h
304  
305   Version.c:      ../rt/Version.c
306          cp ../rt/Version.c .

Diff Legend

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