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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.22 by greg, Thu Apr 11 15:59:14 1996 UTC vs.
Revision 2.33 by greg, Sat Feb 22 02:07:28 2003 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
8 > CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9   SPECIAL = aed
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 + RLIB = ../lib/libradiance.a
32   LIBS = -lrt $(MLIB)
33  
34   #
# Line 44 | Line 44 | DLIBS = -lX11
44   # Standard object files:
45   #
46  
47 < RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
48 < RTSRC = rmain.c rtrace.c duphead.c persist.c preload.c $(RSRC) Version.c
47 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o
48 > RTSRC = rtmain.c rtrace.c duphead.c persist.c
49  
50 < RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o preload.o $(ROBJS) \
51 < Version.o
52 < RPSRC = rmain.c rpict.c srcdraw.c duphead.c persist.c preload.c $(RSRC) \
53 < Version.c
50 > RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o
51 > RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
52  
53 < RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
54 < RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
53 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
54 > RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
55  
56 + RLOBJS = raycalls.o raypcalls.o
57 + RLSRC = raycalls.c raypcalls.c
58 +
59   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
60          $(MODOBJS) $(SUPPOBJS)
61   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
62          $(MODSRC) $(SUPPSRC)
63  
64 < RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
65 < RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
64 > RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
65 >        preload.o raytrace.o renderopts.o
66 > RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \
67 >        preload.c raytrace.c renderopts.c
68  
69   SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
70          o_cone.o o_instance.o
71   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
72 <                srcsamp.c o_cone.c o_instance.c
72 >        srcsamp.c o_cone.c o_instance.c
73  
74   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
75          m_mirror.o m_direct.o m_mist.o fprism.o
# Line 76 | Line 79 | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
79   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
80   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
81  
82 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \
83 <        readfargs.o
81 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
82 <        readfargs.c
82 > SUPPOBJS = func.o noise3.o data.o
83 > SUPPSRC = func.c noise3.c data.c
84  
85   HEADERS = ambient.h ray.h data.h otspecial.h source.h
86  
# Line 89 | Line 90 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
90  
91   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
92  
93 < all:    $(PROGS) $(SPECIAL)
93 > all:    $(PROGS) $(SPECIAL) $(RLOBJS)
94  
95 < install:        $(PROGS) $(SPECIAL) rayinit.cal
95 > install:        all rayinit.cal
96          $(INSTALL) $(PROGS) $(INSTDIR)
97 +        cp $(RLOBJS) ../lib
98          rm -f $(LIBDIR)/rayinit.cal
99          cp rayinit.cal $(LIBDIR)
100  
99 – sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
100 –
101 – x10:    $(DEVDIR)/x10
102 –
101   aed:    $(DEVDIR)/aed
102  
103 < sgi:    $(DEVDIR)/news
103 > ogl:    
104  
107 – tiff:  
108 –
105   clean:
106          set nonomatch; rm -f $(PROGS) *.o core
107  
# Line 116 | Line 112 | lint:  $(RVSRC)
112   # Links:
113   #
114  
115 < $(DESTDIR)/rtrace:      $(RTOBJS)
116 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
115 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
116 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
117  
118 < $(DESTDIR)/rpict:       $(RPOBJS)
119 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
118 > $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
119 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
120  
121 < $(DESTDIR)/rview:       $(RVOBJS)
122 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
121 > $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
122 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(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  
131 – $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
132 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
133 – editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
134 –
135 – $(DEVDIR)/sun.com:      suncom.o editline.o
136 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
137 –
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 –
127   $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
128          $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
129   devmain.o tty.o editline.o $(LIBS)
130  
131 < $(DEVDIR)/news: nwsdev.o devmain.o editline.o
132 <        $(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
133 < -lcps $(LIBS)
131 > $(RLIB):        $(ROBJS) Version.o
132 >        ar rc $(RLIB) $(ROBJS) Version.o
133 >        -ranlib $(RLIB)
134  
135   #
136   # Special compiles:
137   #
138  
139 < rtmain.o:       rmain.c
140 <        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c
156 <        mv rmain.o rtmain.o
139 > rtmain.o:       rtmain.c
140 >        $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
141  
142 < rpmain.o:       rmain.c
143 <        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c
160 <        mv rmain.o rpmain.o
142 > rpmain.o:       rpmain.c
143 >        $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
144  
145 < rvmain.o:       rmain.c
146 <        $(CC) $(CFLAGS) -DRVIEW -c rmain.c
164 <        mv rmain.o rvmain.o
145 > rvmain.o:       rvmain.c
146 >        $(CC) $(CFLAGS) -c rvmain.c
147  
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 –
148   #
149   # Uncomment the following to model dispersion:
150   #
# Line 180 | Line 156 | dielectric.o:  dielectric.c source.h
156   devcomm.o:      devcomm.c
157          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
158  
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 –
159   aed.o:  aed.c
160          $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
161  
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 –
162   #
163   # Version module:
164   #
# Line 214 | Line 172 | Version.c:     VERSION $(RSRC) $(HEADERS)
172   #
173  
174   aed.o ambio.o colortab.o data.o devcomm.o \
175 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
175 > devmain.o lookamb.o rview.o x11.o:      ../common/color.h
176  
177 < o_cone.o srcsupp.o:     ../common/cone.h
177 > freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
178  
179 < data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
179 > data.o freeobjmem.o m_brdf.o mx_data.o \
180 > p_data.o raycalls.o t_data.o:   data.h
181  
182   aed.o devcomm.o devmain.o devtable.o \
183 < editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
183 > editline.o tty.o x11.o: driver.h
184  
185 < o_face.o srcsupp.o:     ../common/face.h
185 > freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
186  
187   ambient.o raytrace.o rpmain.o rtmain.o \
188   rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
# Line 232 | Line 191 | o_instance.o:  ../common/instance.h ../common/octree.h
191  
192   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
193   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
194 < raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
194 > raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
195   virtuals.o:     ../common/otypes.h
196  
197 < ambient.o ambcomp.o aniso.o normal.o rpict.o \
198 < source.o rv3.o srcsamp.o virtuals.o:    ../common/random.h
197 > ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
198 > rtmain.o rpmain.o persist.o source.o rv3.o \
199 > srcsamp.o virtuals.o:   ../common/random.h
200  
201 < ambient.o ambcomp.o aniso.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
202 < m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
203 < p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
204 < rtrace.o rview.o rv2.o rv3.o source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o \
205 < sphere.o m_mist.o t_data.o t_func.o persist.o:  ray.h ../common/standard.h \
201 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
202 > m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
203 > mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
204 > raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
205 > source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
206 > rpmain.o rtmain.o rvmain.o virtuals.o:  ray.h \
207 > ../common/standard.h ../common/octree.h \
208   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
209  
210 < rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
210 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
211  
212 < m_direct.o m_mirror.o m_mist.o dielectric.o \
212 > m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
213   source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
214  
215 < cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o \
215 > cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
216   duphead.o octree.o:     ../common/standard.h ../common/mat4.h ../common/fvect.h
217  
218 + ambio.o:        ../common/fvect.h
219 +
220   initotypes.o raytrace.o:        otspecial.h
221  
222 < sundev.o:       suntools.icon
222 > rpmain.o rtmain.o rvmain.o rpict.o \
223 > srcdraw.o:      ../common/view.h ../common/resolu.h
224  
260 – rpmain.o rtmain.o rvmain.o rpict.o srcdraw.o:   ../common/view.h
261 –
262 – x10.o xtwind.o: xtwind.h
263 –
225   x11.o x11twind.o: x11twind.h
226  
227   x11.o:  x11icon.h
228  
229 < ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
229 > ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:       ambient.h
230  
231 < data.o rmain.o rpict.o rtrace.o rv2.o:  ../common/resolu.h
231 > data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
232 > rv2.o:  ../common/resolu.h
233  
234   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
235   p_func.o t_data.o t_func.o:     func.h
236  
237 < freeobjmem.o:   ../common/object.h
237 > preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
238 > ../common/instance.h ../common/color.h data.h
239  
240   devcomm.o:      ../common/vfork.h
241  
242   rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
243 +
244 + freeobjmem.o raycalls.o text.o: ../common/font.h
245 +
246 + raypcalls.o:    ../common/selcall.h

Diff Legend

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