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.26 by gregl, Fri Nov 14 12:35:45 1997 UTC vs.
Revision 2.63 by greg, Fri Feb 18 02:41:55 2011 UTC

# Line 1 | Line 1
1 + # RCSid: $Id$
2   #
2 – # SCCSid "$SunId$ LBL"
3   # Compiles for ray tracing programs.
4   #
5  
6   OPT = -O
7   MACH = -DBSD
8 < CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9 < SPECIAL = aed
8 > CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9 > SPECIAL =
10   CC = cc
11   MLIB = -lm
12   LINT = lint
13 < LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
14 < -DINCHAN -DRCONST -DREDEFW
13 > LINTFLAGS = -DBSD
14  
15   #
16   # The following are user-definable:
# Line 29 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = -lrt $(MLIB)
31 > RLIB = ../lib/libradiance.a
32 > RCLIB = ../lib/libraycalls.a
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 44 | Line 45 | DLIBS = -lX11
45   # Standard object files:
46   #
47  
48 < RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
49 < RTSRC = rmain.c rtrace.c duphead.c persist.c preload.c $(RSRC) Version.c
48 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o
49 > RTSRC = rtmain.c rtrace.c duphead.c persist.c
50  
51 < RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o preload.o $(ROBJS) \
52 < Version.o
52 < RPSRC = rmain.c rpict.c srcdraw.c duphead.c persist.c preload.c $(RSRC) \
53 < Version.c
51 > RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o
52 > RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
53  
54 < RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
55 < RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.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 rayfifo.o
58 + RLSRC = raycalls.c raypcalls.c rayfifo.c
59 +
60   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
61          $(MODOBJS) $(SUPPOBJS)
62   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
63          $(MODSRC) $(SUPPSRC)
64  
65 < RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
66 < RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
65 > RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
66 >        preload.o raytrace.o renderopts.o
67 > RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \
68 >        preload.c raytrace.c renderopts.c
69  
70 < SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
71 <        o_cone.o o_instance.o
72 < SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
73 <                srcsamp.c o_cone.c o_instance.c
70 > SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
71 >        o_face.o o_cone.o o_instance.o o_mesh.o
72 > SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
73 >        o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
74  
75   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
76 <        m_mirror.o m_direct.o m_mist.o fprism.o
76 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o
77   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
78 <        m_mirror.c m_direct.c m_mist.c fprism.c
78 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c
79  
80   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
81   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
82  
83 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \
84 <        readfargs.o
81 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
82 <        readfargs.c
83 > SUPPOBJS = func.o noise3.o data.o
84 > SUPPSRC = func.c noise3.c data.c
85  
86   HEADERS = ambient.h ray.h data.h otspecial.h source.h
87  
# Line 87 | Line 89 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
89   # What this makefile produces:
90   #
91  
92 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
92 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
93  
94 < all:    $(PROGS) $(SPECIAL)
94 > all:    $(PROGS) $(RCLIB) $(SPECIAL)
95  
96 < install:        $(PROGS) $(SPECIAL) rayinit.cal
96 > install:        all rayinit.cal
97          $(INSTALL) $(PROGS) $(INSTDIR)
98 +        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
99          rm -f $(LIBDIR)/rayinit.cal
100          cp rayinit.cal $(LIBDIR)
101  
102 < sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
102 > ogl:    
103  
101 – x10:    $(DEVDIR)/x10
102 –
103 – aed:    $(DEVDIR)/aed
104 –
105 – sgi:    $(DEVDIR)/news
106 –
107 – tiff:  
108 –
104   clean:
105          set nonomatch; rm -f $(PROGS) *.o core
106  
# Line 116 | Line 111 | lint:  $(RVSRC)
111   # Links:
112   #
113  
114 < $(DESTDIR)/rtrace:      $(RTOBJS)
115 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
114 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
115 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
116  
117 < $(DESTDIR)/rpict:       $(RPOBJS)
118 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
117 > $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
118 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
119  
120 < $(DESTDIR)/rview:       $(RVOBJS)
121 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
120 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
121 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
122 > $(RLIB) $(LIBS) $(DLIBS)
123  
124   $(DESTDIR)/lookamb:     lookamb.o ambio.o
125 <        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
125 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
126  
127 < $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
128 <        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
129 < editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
127 > $(RLIB):        $(ROBJS) Version.o
128 >        rm -f $(RLIB)
129 >        ar rc $(RLIB) $(ROBJS) Version.o
130 >        -ranlib $(RLIB)
131  
132 < $(DEVDIR)/sun.com:      suncom.o editline.o
133 <        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
132 > $(RCLIB):       $(RLOBJS)
133 >        rm -f $(RCLIB)
134 >        ar rc $(RCLIB) $(RLOBJS)
135 >        -ranlib $(RCLIB)
136  
138 – $(DEVDIR)/x10:  x10.o xtwind.o colortab.o devmain.o editline.o
139 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
140 – colortab.o editline.o -lX $(LIBS)
141 –
142 – $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
143 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
144 – devmain.o tty.o editline.o $(LIBS)
145 –
146 – $(DEVDIR)/news: nwsdev.o devmain.o editline.o
147 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
148 – -lcps $(LIBS)
149 –
137   #
151 – # Special compiles:
152 – #
153 –
154 – rtmain.o:       rmain.c
155 –        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c
156 –        mv rmain.o rtmain.o
157 –
158 – rpmain.o:       rmain.c
159 –        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c
160 –        mv rmain.o rpmain.o
161 –
162 – rvmain.o:       rmain.c
163 –        $(CC) $(CFLAGS) -DRVIEW -c rmain.c
164 –        mv rmain.o rvmain.o
165 –
166 – readfargs.o:    readfargs.c ../common/object.h
167 –        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
168 –
169 – malloc.o:       malloc.c
170 –        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
171 –
172 – #
138   # Uncomment the following to model dispersion:
139   #
140   dielectric.o:   dielectric.c source.h
# Line 180 | Line 145 | dielectric.o:  dielectric.c source.h
145   devcomm.o:      devcomm.c
146          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
147  
183 – sundev.o:       sundev.c
184 –        $(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
185 –
186 – x10.o:  x10.c
187 –        $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
188 –
189 – aed.o:  aed.c
190 –        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
191 –
192 – calexpr.o:      calexpr.c ../common/calcomp.h
193 –        $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
194 –
195 – caldefn.o:      caldefn.c ../common/calcomp.h
196 –        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
197 –
198 – nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
199 –        $(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
200 –
201 – nwsdev.h:       nwsdev.cps newsconstants.h
202 –        cps nwsdev.cps
203 –
148   #
149   # Version module:
150   #
# Line 213 | Line 157 | Version.c:     VERSION $(RSRC) $(HEADERS)
157   # Include dependencies:
158   #
159  
160 < aed.o ambio.o colortab.o data.o devcomm.o \
161 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
160 > ambio.o colortab.o data.o devcomm.o \
161 > devmain.o lookamb.o rview.o x11.o:      ../common/color.h
162  
163 < o_cone.o srcsupp.o:     ../common/cone.h
163 > freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
164  
165 < data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
165 > data.o freeobjmem.o m_brdf.o mx_data.o \
166 > p_data.o raycalls.o t_data.o:   data.h
167  
168 < aed.o devcomm.o devmain.o devtable.o \
169 < editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
168 > devcomm.o devmain.o devtable.o \
169 > editline.o x11.o:       driver.h
170  
171 < o_face.o srcsupp.o:     ../common/face.h
171 > freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
172  
173   ambient.o raytrace.o rpmain.o rtmain.o \
174 < rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
174 > rtrace.o rvmain.o rv2.o rv3.o:  ../common/octree.h
175  
176 < o_instance.o:   ../common/instance.h ../common/octree.h
176 > o_instance.o:   ../common/instance.h
177  
178   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
179   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
180 < raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
181 < virtuals.o:     ../common/otypes.h
180 > raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
181 > srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
182  
183 < ambient.o ambcomp.o aniso.o normal.o rpict.o \
184 < source.o rv3.o srcsamp.o virtuals.o:    ../common/random.h
183 > ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
184 > rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
185 > srcsamp.o virtuals.o:   ../common/random.h
186  
187 < ambcomp.o ambient.o aniso.o dielectric.o func.o glass.o glazing.o \
188 < m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o mx_func.o \
189 < normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o raytrace.o \
190 < rpict.o rtrace.o rv2.o rv3.o rview.o source.o sphere.o srcdraw.o \
191 < srcsamp.o srcsupp.o t_data.o t_func.o text.o rpmain.o rtmain.o rvmain.o \
192 < virtuals.o:     ray.h ../common/standard.h \
187 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
188 > m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
189 > mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
190 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
191 > source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
192 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
193 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
194 > ../common/rterror.h ../common/octree.h \
195   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
196  
197 < rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
197 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
198  
199 < m_direct.o m_mirror.o m_mist.o dielectric.o \
200 < source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
199 > m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
200 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
201 > srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
202  
203 < cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o preload.o \
204 < duphead.o octree.o:     ../common/standard.h ../common/mat4.h ../common/fvect.h
203 > cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
204 > duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
205 > ../common/rtio.h ../common/rtmath.h \
206 > ../common/rterror.h ../common/mat4.h ../common/fvect.h
207  
208   ambio.o:        ../common/fvect.h
209  
210 < initotypes.o raytrace.o:        otspecial.h
210 > initotypes.o srcobstr.o raytrace.o:     otspecial.h
211  
212 < sundev.o:       suntools.icon
212 > rpmain.o rtmain.o rvmain.o rpict.o \
213 > srcdraw.o:      ../common/view.h ../common/resolu.h
214  
263 – rpmain.o rtmain.o rvmain.o rpict.o srcdraw.o:   ../common/view.h
264 –
265 – x10.o xtwind.o: xtwind.h
266 –
215   x11.o x11twind.o: x11twind.h
216  
217   x11.o:  x11icon.h
218  
219 < ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
219 > ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
220  
221   data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
222   rv2.o:  ../common/resolu.h
223  
224   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
225 < p_func.o t_data.o t_func.o:     func.h
225 > p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
226  
227 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
228 < ../common/instance.h ../common/color.h data.h
227 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
228 > ../common/cone.h ../common/instance.h ../common/mesh.h \
229 > ../common/color.h ../common/bsdf.h ../common/otypes.h
230  
231 < freeobjmem.o:   ../common/object.h
231 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
232 > renderopts.o rpict.o:   ../common/paths.h
233  
234 < devcomm.o:      ../common/vfork.h
234 > freeobjmem.o raycalls.o text.o: ../common/font.h
235  
236 < rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
236 > raypcalls.o:    ../common/selcall.h
237 >
238 > o_mesh.o:       ../common/mesh.h
239 >
240 > noise3.o:       ../common/calcomp.h
241 >
242 > aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
243 > m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
244 > mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
245 > o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
246 > srcobstr.o text.o:              rtotypes.h
247 >
248 > m_bsdf.o:       ambient.h source.h func.h \
249 > ../common/calcomp.h ../common/bsdf.h ../common/random.h

Diff Legend

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