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.17 by simmons, Fri Dec 18 11:58:30 1998 UTC vs.
Revision 3.19 by gwlarson, Thu Dec 31 16:24:59 1998 UTC

# Line 18 | Line 18 | DEVDIR = $(INSTDIR)/dev
18  
19   LIBDIR = /usr/local/lib/ray
20  
21 < PROGS = rholo rhcopy genrhgrid rhoptimize
21 > PROGS = rholo rhcopy genrhgrid rhoptimize rhinfo
22  
23   DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
24  
# Line 40 | Line 40 | ogl:   $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi \
40          $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
41          $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
42  
43 –
43   x10:
44  
45   aed:
# 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 153 | Line 155 | sm_ogl.o sm_usets.o sm.o dircode.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 \
158 < rhd_odraw.o rhd_octree.o holo.o
157 <        rm -f $(DEVDIR)/ogl.hdi
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_octree.o -lrgl -lrt -lGLU -lGL -lX11 -lm
160 > rhdisp3.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 \
163 < rhd_odraw.o rhd_octree.o holo.o rhdobj.o
163 <        rm -f $(DEVDIR)/oglo.hdi
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_octree.o rhdobj.o \
165 > rhdisp2.o rhdisp3.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 \
169 < rhd_odraw.o rhd_octree.o holo.o
170 <        rm -f $(DEVDIR)/ogls.hdi
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_octree.o \
171 > rhdisp3.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 \
175 < rhd_odraw.o rhd_octree.o holo.o rhdobj.o
177 <        rm -f $(DEVDIR)/oglso.hdi
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_octree.o rhdobj.o \
177 > rhdisp3.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 228 | Line 226 | rhdisp3.o:     rhdisp.h ../common/view.h
226  
227   holo.o holofile.o rhdisp.o rhdisp2.o rhdisp3.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:     holo.h \
230   ../common/vars.h ../common/color.h \
231   ../common/standard.h ../common/mat4.h ../common/fvect.h
232  
# Line 289 | Line 287 | rhdriver.h ../common/view.h ../common/color.h ../commo
287   rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:   x11icon.h
288  
289   rhd_oglo.o rhd_oglso.o: rhdobj.h
290 +
291 + rhd_geom.o:     rhdriver.h ../common/view.h \
292 + ../common/radogl.h ../common/standard.h ../common/fvect.h \
293 + ../common/mat4.h ../common/object.h ../common/otypes.h ../common/lookup.h

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)