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.18 by gwlarson, Mon Dec 28 18:07:07 1998 UTC vs.
Revision 3.23 by greg, Fri Jun 27 06:53:22 2003 UTC

# Line 1 | Line 1
1 + # RCSid: $Id$
2   #
2 – # SCCSid "$SunId$ SGI"
3   # Radiance makefile for holodeck programs
4   #
5  
# Line 7 | Line 7 | MACH = -DBSD
7  
8   OPT = -O
9  
10 < CFLAGS = $(MACH) $(OPT) -I../common -L../lib
10 > CFLAGS = -I../common -L../lib $(OPT) $(MACH)
11  
12   CC = cc
13  
# Line 18 | Line 18 | DEVDIR = $(INSTDIR)/dev
18  
19   LIBDIR = /usr/local/lib/ray
20  
21 < PROGS = rholo rhcopy genrhgrid rhoptimize
21 > PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo
22  
23   DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
24  
# Line 30 | Line 30 | install:       all $(DEVS) $(SPECIAL)
30   clean:
31          set nonomatch; rm -f *.o $(PROGS) core
32  
33 < ogl:    $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi \
34 <        $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi \
35 <        $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi \
36 <        $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi \
37 <        $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi \
38 <        $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
33 > ogl:    $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
34          $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
35          $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
36 <        $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
36 >        $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi \
37 >        $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
38  
43 –
39   x10:
40  
41   aed:
# Line 50 | Line 45 | sgi:
45   sun:
46  
47   rholo:  rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
48 < malloc.o Version.o
48 > viewbeams.o Version.o
49          $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
50 < holo.o holofile.o malloc.o Version.o -lrt -lm
50 > holo.o holofile.o viewbeams.o Version.o -lrt -lm
51  
52 + rhpict: rhpict.o rhpict2.o holo.o holofile.o viewbeams.o Version.o
53 +        $(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
54 + viewbeams.o Version.o -lrt -lm
55 +
56   rhcopy: rhcopy.o clumpbeams.o holo.o holofile.o
57          $(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
58   holo.o holofile.o -lrt -lm
# Line 62 | Line 61 | rhoptimize:    rhoptimize.o clumpbeams.o holo.o holofile.
61          $(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
62   holo.o holofile.o -lrt -lm
63  
64 + rhinfo: rhinfo.o holo.o holofile.o
65 +        $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrt -lm
66 +
67   genrhenv:       genrhenv.o holo.o holofile.o
68          $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
69  
# Line 72 | Line 74 | $(DEVDIR)/x11h.hdi:    $(DEVDIR)/x11.hdi
74          rm -f $(DEVDIR)/x11h.hdi
75          ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
76  
77 < $(DEVDIR)/x11.hdi:      rhdisp.o rhdisp2.o rhdisp3.o rhd_x11.o rhd_qtree.o \
78 < rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
79 <        $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o rhdisp3.o \
80 < rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
77 > $(DEVDIR)/x11.hdi:      rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.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 -lrt -lX11 -lm
81  
82   $(DEVDIR)/glx1h.hdi:    $(DEVDIR)/glx1.hdi
83          rm -f $(DEVDIR)/glx1h.hdi
# Line 113 | Line 115 | $(DEVDIR)/oglsoh.hdi:  $(DEVDIR)/oglso.hdi
115          rm -f $(DEVDIR)/oglsoh.hdi
116          ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
117  
118 < $(DEVDIR)/glx1.hdi:     rhd_glx1.o rhdisp.o rhdisp2.o rhdisp3.o \
119 < rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
118 > $(DEVDIR)/glx1.hdi:     rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.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 < rhdisp3.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 rhdisp3.o \
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 < rhdisp3.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
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 -lrt -lGLU -lGL -lX11 -lm
131  
132 < $(DEVDIR)/glxo.hdi:     rhd_glxo.o rhdisp.o rhdisp2.o rhdisp3.o \
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 < rhdisp3.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
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 rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
139  
140 < $(DEVDIR)/glxs.hdi:     rhd_glxs.o rhdisp.o rhdisp2.o rhdisp3.o \
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 < rhdisp3.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
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 -lrt -lGLU -lGL -lX11 -lXext -lm
147  
148 < $(DEVDIR)/glxso.hdi:    rhd_glxso.o rhdisp.o rhdisp2.o rhdisp3.o \
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 < rhdisp3.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 \
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 rhdobj.o \
155   -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
156  
157 < $(DEVDIR)/ogl.hdi:      rhd_ogl0.o rhdisp.o rhdisp2.o rhdisp3.o \
157 > $(DEVDIR)/ogl.hdi:      rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
158   rhd_odraw.o rhd_geom.o holo.o
159          $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
160 < rhdisp3.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
160 > viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
161  
162 < $(DEVDIR)/oglo.hdi:     rhd_oglo.o rhdisp.o rhdisp2.o rhdisp3.o \
162 > $(DEVDIR)/oglo.hdi:     rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
163   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
164          $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
165 < rhdisp2.o rhdisp3.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
165 > rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
166   -lrgl -lrt -lGLU -lGL -lX11 -lm
167  
168 < $(DEVDIR)/ogls.hdi:     rhd_ogls.o rhdisp.o rhdisp2.o rhdisp3.o \
168 > $(DEVDIR)/ogls.hdi:     rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
169   rhd_odraw.o rhd_geom.o holo.o
170          $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
171 < rhdisp3.o holo.o rhd_odraw.o rhd_geom.o \
171 > viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
172   -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
173  
174 < $(DEVDIR)/oglso.hdi:    rhd_oglso.o rhdisp.o rhdisp2.o rhdisp3.o \
174 > $(DEVDIR)/oglso.hdi:    rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
175   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
176          $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
177 < rhdisp3.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
177 > viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
178   -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
179  
180   rhd_glx0.o:     rhd_glx.c
# Line 207 | Line 209 | rhd_oglso.o:   rhd_ogl.c
209          $(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_ogl.c
210          mv -f rhd_ogl.o rhd_oglso.o
211  
210 – malloc.o:       malloc.c
211 –        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
212 –
212   rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
213 < rhdisp.o rhdisp2.o rhdisp3.o:   rholo.h
213 > rhdisp.o rhdisp2.o rhpict.o viewbeams.o:        rholo.h
214  
215   rholo2l.o:      ../common/paths.h
216  
217 < rholo4.o:       rhdisp.h rholo4.c
219 <        $(CC) $(CFLAGS) -c rholo4.c
217 > rhpict2.o rholo3.o:     ../common/view.h
218  
219 + rholo4.o:       rhdisp.h
220 +
221   rhdisp.o rhdisp2.o:     rhdisp.h rhdriver.h ../common/view.h
222  
223 < rhdisp3.o:      rhdisp.h ../common/view.h
223 > viewbeams.o:    ../common/view.h ../common/random.h
224  
225 < holo.o holofile.o rhdisp.o rhdisp2.o rhdisp3.o genrhenv.o genrhgrid.o \
225 > rhpict.o:       ../common/view.h ../common/resolu.h
226 >
227 > holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhenv.o genrhgrid.o \
228   rhcopy.o rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
229 < clumpbeams.o rhoptimize.o:      holo.h \
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
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 241 | 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  
271   sm_samp.o:      sm_flag.h
272  
273 < sm_usets.o:     sm_flag.h sm_qtree.h  ../common/object.h
273 > sm_usets.o:     sm_flag.h sm_qtree.h ../common/object.h
274  
275   sm_del.o:       sm_flag.h sm_list.h sm_geom.h
276  
# Line 271 | 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  
274 – dircode.o:      ../common/fvect.h
275 –
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  
280 – rhdisp2.o:      ../common/random.h
281 –
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
295  
# 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