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.22 by greg, Tue Mar 4 05:49:21 2003 UTC vs.
Revision 3.28 by greg, Wed Nov 21 17:52:05 2007 UTC

# Line 7 | Line 7 | MACH = -DBSD
7  
8   OPT = -O
9  
10 < CFLAGS = -I../common -L../lib $(OPT) $(MACH)
10 > CFLAGS = -I../common -L../lib $(OPT) $(MACH) -DDEVPATH=\"$(DEVDIR)\"
11  
12   CC = cc
13  
# Line 28 | Line 28 | install:       all $(DEVS) $(SPECIAL)
28          cp $(PROGS) $(INSTDIR)
29  
30   clean:
31 <        set nonomatch; rm -f *.o $(PROGS) core
31 >        set nonomatch; rm -f *.o $(PROGS) core Version.c
32  
33   ogl:    $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
34          $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
# Line 47 | Line 47 | sun:
47   rholo:  rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.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 viewbeams.o Version.o -lrt -lm
50 > holo.o holofile.o viewbeams.o Version.o -lrtrad -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
54 > viewbeams.o Version.o -lrtrad -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
58 > holo.o holofile.o -lrtrad -lm
59  
60   rhoptimize:     rhoptimize.o clumpbeams.o holo.o holofile.o
61          $(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
62 < holo.o holofile.o -lrt -lm
62 > holo.o holofile.o -lrtrad -lm
63  
64   rhinfo: rhinfo.o holo.o holofile.o
65 <        $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrt -lm
65 >        $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrtrad -lm
66  
67 – genrhenv:       genrhenv.o holo.o holofile.o
68 –        $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
69 –
67   genrhgrid:      genrhgrid.o holo.o
68 <        $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrt -lm
68 >        $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrtrad -lm
69  
70   $(DEVDIR)/x11h.hdi:     $(DEVDIR)/x11.hdi
71          rm -f $(DEVDIR)/x11h.hdi
# Line 77 | Line 74 | $(DEVDIR)/x11h.hdi:    $(DEVDIR)/x11.hdi
74   $(DEVDIR)/x11.hdi:      rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
75   rhd_qtree2r.o rhd_ctab.o holo.o
76          $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
77 < rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrt -lX11 -lm
77 > rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrtrad -lX11 -lm
78  
79   $(DEVDIR)/glx1h.hdi:    $(DEVDIR)/glx1.hdi
80          rm -f $(DEVDIR)/glx1h.hdi
81          ln $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
82  
86 – $(DEVDIR)/glxh.hdi:     $(DEVDIR)/glx.hdi
87 –        rm -f $(DEVDIR)/glxh.hdi
88 –        ln $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
89 –
83   $(DEVDIR)/glxoh.hdi:    $(DEVDIR)/glxo.hdi
84          rm -f $(DEVDIR)/glxoh.hdi
85          ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi
# Line 119 | Line 112 | $(DEVDIR)/glx1.hdi:    rhd_glx1.o rhdisp.o rhdisp2.o view
112   rhd_qtree.o rhd_qtree2c.o holo.o
113          rm -f $(DEVDIR)/glx1.hdi
114          $(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
115 < viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrt -lGLU -lGL -lX11 -lm
115 > viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrtrad -lGLU -lGL -lX11 -lm
116  
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 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 -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 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 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 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 -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 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 rhdobj.o \
155 – -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
156 –
117   $(DEVDIR)/ogl.hdi:      rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
118   rhd_odraw.o rhd_geom.o holo.o
119          $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
120 < viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
120 > viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrtrad -lGLU -lGL -lX11 -lm
121  
122   $(DEVDIR)/oglo.hdi:     rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
123   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
124          $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
125   rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
126 < -lrgl -lrt -lGLU -lGL -lX11 -lm
126 > -lrgl -lrtrad -lGLU -lGL -lX11 -lm
127  
128   $(DEVDIR)/ogls.hdi:     rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
129   rhd_odraw.o rhd_geom.o holo.o
130          $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
131   viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
132 < -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
132 > -lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
133  
134   $(DEVDIR)/oglso.hdi:    rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
135   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
136          $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
137   viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
138 < -lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
138 > -lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
139  
180 – rhd_glx0.o:     rhd_glx.c
181 –        $(CC) $(CFLAGS) -c rhd_glx.c
182 –        mv -f rhd_glx.o rhd_glx0.o
183 –
184 – rhd_glxo.o:     rhd_glx.c
185 –        $(CC) $(CFLAGS) -DDOBJ -c rhd_glx.c
186 –        mv -f rhd_glx.o rhd_glxo.o
187 –
188 – rhd_glxs.o:     rhd_glx.c
189 –        $(CC) $(CFLAGS) -DSTEREO -c rhd_glx.c
190 –        mv -f rhd_glx.o rhd_glxs.o
191 –
192 – rhd_glxso.o:    rhd_glx.c
193 –        $(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_glx.c
194 –        mv -f rhd_glx.o rhd_glxso.o
195 –
140   rhd_ogl0.o:     rhd_ogl.c
141          $(CC) $(CFLAGS) -c rhd_ogl.c
142          mv -f rhd_ogl.o rhd_ogl0.o
# Line 224 | Line 168 | viewbeams.o:   ../common/view.h ../common/random.h
168  
169   rhpict.o:       ../common/view.h ../common/resolu.h
170  
171 < holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhenv.o genrhgrid.o \
171 > holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhgrid.o \
172   rhcopy.o rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
173   rhinfo.o clumpbeams.o rhoptimize.o rhpict.o rhpict2.o:  holo.h \
174   ../common/vars.h ../common/color.h \
175 < ../common/standard.h ../common/mat4.h ../common/fvect.h
175 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
176 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
177 > ../common/rterror.h ../common/tifftypes.h
178  
179   rhcopy.o:       ../common/resolu.h ../common/view.h
180  
181   rhd_x11.o rhd_qtree.o rhd_sets.o rhd_qtree2r.o rhd_odraw.o rhd_ogl0.o \
182   rhd_oglo.o rhd_ogls.o rhd_oglso.o:      ../common/standard.h \
183 < ../common/mat4.h ../common/fvect.h
183 > ../common/rtmisc.h ../common/rtio.h \
184 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
185 > ../common/rterror.h
186  
187   rhd_x11.o rhd_qtree.o rhd_qtree2r.o:    rhd_qtree.h rhdriver.h \
188   ../common/view.h ../common/tonemap.h ../common/color.h
189  
190   rhd_x11.o:      x11icon.h
191  
244 – rhd_glx0.o rhd_glxo.o rhd_glxs.o rhd_glxso.o:   rhd_sample.h rhdriver.h \
245 – x11icon.h ../common/tonemap.h ../common/view.h \
246 – ../common/standard.h ../common/mat4.h ../common/fvect.h
247 –
192   rhd_glxo.o rhd_glxso.o rhdobj.o:        rhdobj.h
193  
194   rhdobj.o:       rhdisp.h rhdriver.h ../common/view.h ../common/tonemap.h \
195 < ../common/radogl.h ../common/standard.h ../common/fvect.h ../common/mat4.h \
195 > ../common/radogl.h  ../common/standard.h \
196 > ../common/rtmisc.h ../common/rtio.h \
197 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
198 > ../common/rterror.h \
199   ../common/object.h ../common/otypes.h ../common/lookup.h
200  
254 – sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
255 – sm_ogl.o sm.o:  sm.h rhd_sample.h \
256 – ../common/standard.h ../common/mat4.h ../common/fvect.h
257 –
258 – sm.o:           sm_flag.h
259 –
260 – sm_samp.o:      sm_flag.h
261 –
262 – sm_usets.o:     sm_flag.h sm_qtree.h ../common/object.h
263 –
264 – sm_del.o:       sm_flag.h sm_list.h sm_geom.h
265 –
266 – sm_geom.o:      sm_geom.h
267 –
268 – sm_list.o:      sm_list.h
269 –
270 – sm_ogl.o:       sm_flag.h sm_geom.h ../common/object.h
271 –
272 – sm_qtree.o:     sm_flag.h sm_geom.h sm_qtree.h ../common/object.h
273 –
274 – sm_stree.o:     sm_flag.h sm_stree.h sm_qtree.h sm_geom.h ../common/object.h
275 –
201   rhd_glx1.o:     rhd_qtree.h rhdriver.h x11icon.h ../common/view.h \
202 < ../common/color.h ../common/tonemap.h ../common/standard.h ../common/fvect.h \
203 < ../common/mat4.h
202 > ../common/color.h ../common/tonemap.h \
203 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
204 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
205 > ../common/rterror.h
206  
207   rhd_odraw.o rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:       rhd_odraw.h \
208   rhdriver.h ../common/view.h ../common/color.h ../common/tonemap.h
# Line 285 | Line 212 | rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:  x11icon.
212   rhd_oglo.o rhd_oglso.o: rhdobj.h
213  
214   rhd_geom.o:     rhdriver.h ../common/view.h \
215 < ../common/radogl.h ../common/standard.h ../common/fvect.h \
216 < ../common/mat4.h ../common/object.h ../common/otypes.h ../common/lookup.h
215 > ../common/radogl.h ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
216 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
217 > ../common/rterror.h ../common/object.h ../common/otypes.h ../common/lookup.h
218  
219   Version.c:      ../rt/Version.c
220          cp ../rt/Version.c .

Diff Legend

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