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 1.51 by greg, Mon Jul 15 11:50:26 1991 UTC vs.
Revision 2.13 by greg, Fri Feb 12 10:38:36 1993 UTC

# Line 1 | Line 1
1 + #
2   # SCCSid "$SunId$ LBL"
3 <
3 > # Compiles for ray tracing programs.
4   #
4 – #  Compiles for ray tracing programs.
5 – #
5  
6 < OPT = -O -pipe
7 < MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT)
6 > OPT = -O
7 > MACH = -DBSD
8 > CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9 > SPECIAL = aed
10   CC = cc
11   LINT = lint
12 < LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB
12 > LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
13 > -DINCHAN -DRCONST -DREDEFW
14  
15   #
16   # The following are user-definable:
17   #
18   DESTDIR = .
19 < INSTDIR = /lumen/lumen/ray/bin.sun3
19 > INSTDIR = /usr/local/bin
20   INSTALL = cp
21  
22   #
# Line 28 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = ../common/librt.a -lm
31 > LIBS = -lrt -lm
32  
33   #
34   # Device drivers for rview (see also devtable.c):
# Line 43 | Line 43 | DLIBS = -lX11
43   # Standard object files:
44   #
45  
46 < RTOBJS = rtmain.o rtrace.o $(ROBJS)
47 < RTSRC = rmain.c rtrace.c $(RSRC)
46 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
47 > RTSRC = rmain.c rtrace.c $(RSRC) Version.c
48  
49 < RPOBJS = rpmain.o rpict.o $(ROBJS)
50 < RPSRC = rmain.c rpict.c $(RSRC)
49 > RPOBJS = rpmain.o rpict.o duphead.o persist.o preload.o $(ROBJS) Version.o
50 > RPSRC = rmain.c rpict.c $(RSRC) Version.c
51  
52 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
53 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
52 > RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
53 > RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
54  
55   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56          $(MODOBJS) $(SUPPOBJS)
57   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
58          $(MODSRC) $(SUPPSRC)
59  
60 < RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
61 < RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
60 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
61 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
62  
63 < SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
64 <        o_instance.o
63 > SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
64 >        o_cone.o o_instance.o
65   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
66 <                o_cone.c o_instance.c
66 >                srcsamp.c o_cone.c o_instance.c
67  
68 < MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
69 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c
68 > MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
69 >        m_mirror.o m_direct.o
70 > MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
71 >        m_mirror.c m_direct.c
72  
73   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
74   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
75  
76 < SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
77 < SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
76 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
77 >        malloc.o
78 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
79 >        malloc.c
80  
81 + HEADERS = ambient.h ray.h data.h otspecial.h source.h
82 +
83   #
84   # What this makefile produces:
85   #
86  
87   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
88  
89 < all:    $(PROGS)
89 > all:    $(PROGS) $(SPECIAL)
90  
91 < install:        $(PROGS)
91 > install:        $(PROGS) $(SPECIAL) rayinit.cal
92          $(INSTALL) $(PROGS) $(INSTDIR)
93 +        rm -f $(LIBDIR)/rayinit.cal
94 +        cp rayinit.cal $(LIBDIR)
95  
96   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
97  
# Line 91 | Line 99 | x10:   $(DEVDIR)/x10
99  
100   aed:    $(DEVDIR)/aed
101  
102 + sgi:    $(DEVDIR)/news
103 +
104 + tiff:  
105 +
106   clean:
107          set nonomatch; rm -f $(PROGS) *.o core
108  
# Line 110 | Line 122 | $(DESTDIR)/rpict:      $(RPOBJS)
122   $(DESTDIR)/rview:       $(RVOBJS)
123          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
124  
125 < $(DESTDIR)/lookamb:     lookamb.o
126 <        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
125 > $(DESTDIR)/lookamb:     lookamb.o ambio.o
126 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
127  
128   $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
129          $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
# Line 128 | Line 140 | $(DEVDIR)/aed: aed.o colortab.o tty.o devmain.o editli
140          $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
141   devmain.o tty.o editline.o $(LIBS)
142  
143 + $(DEVDIR)/news: nwsdev.o devmain.o editline.o
144 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
145 + -lcps $(LIBS)
146 +
147   #
148   # Special compiles:
149   #
# Line 144 | Line 160 | rvmain.o:      rmain.c
160          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
161          mv rmain.o rvmain.o
162  
163 + readfargs.o:    readfargs.c ../common/object.h
164 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
165 +
166 + malloc.o:       malloc.c
167 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
168 +
169   #
170   # Uncomment the following to model dispersion:
171   #
172 < #dielectric.o:  dielectric.c source.h
173 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
174 < #
172 > dielectric.o:   dielectric.c source.h
173 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
174 >
175   # end of dispersion compiles.
176  
177   devcomm.o:      devcomm.c
# Line 164 | Line 186 | x10.o: x10.c
186   aed.o:  aed.c
187          $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
188  
189 < ambient.o:      ambient.c
168 <        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
169 <
170 < calexpr.o:      calexpr.c calcomp.h
189 > calexpr.o:      calexpr.c ../common/calcomp.h
190          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
191  
192 < caldefn.o:      caldefn.c calcomp.h
193 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
192 > caldefn.o:      caldefn.c ../common/calcomp.h
193 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
194  
176 – calfunc.o:      calfunc.c calcomp.h
177 –        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178 –
195   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
196 <        $(CC) $(CFLAGS) -c nwsdev.c
196 >        $(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
197  
198   nwsdev.h:       nwsdev.cps newsconstants.h
199          cps nwsdev.cps
200  
201   #
202 < # Include dependencies:
202 > # Version module:
203   #
204  
205 < caldefn.o calexpr.o calfunc.o:  calcomp.h
205 > Version.c:      VERSION $(RSRC) $(HEADERS)
206 >        ( cat VERSION ; date ; whoami ; hostname ) > Version.c
207 >        ed - Version.c < verscript.ed
208  
209 < aed.o colortab.o data.o devcomm.o \
210 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
209 > #
210 > # Include dependencies:
211 > #
212  
213 < o_cone.o srcsupp.o:     cone.h
213 > aed.o ambio.o colortab.o data.o devcomm.o \
214 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
215  
216 + o_cone.o srcsupp.o:     ../common/cone.h
217 +
218   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
219  
220   aed.o devcomm.o devmain.o devtable.o \
221   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
222  
223 < o_face.o srcsupp.o:     face.h
223 > o_face.o srcsupp.o:     ../common/face.h
224  
225   ambient.o raytrace.o rpmain.o rtmain.o \
226 < rtrace.o rvmain.o rv2.o rv3.o source.o: octree.h
226 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
227  
228 < o_instance.o:   instance.h octree.h
228 > o_instance.o:   ../common/instance.h ../common/octree.h
229  
230 < ambient.o dielectric.o func.o initotypes.o m_brdf.o \
231 < normal.o o_cone.o text.o raytrace.o rtrace.o \
232 < rv2.o source.o srcsupp.o virtuals.o sphere.o:   otypes.h
230 > ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \
231 > normal.o o_cone.o text.o raytrace.o rtrace.o freeobjmem.o \
232 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
233  
234 < ambient.o ambcomp.o rpict.o rv3.o source.o:     random.h
234 > ambient.o ambcomp.o aniso.o normal.o rpict.o \
235 > rv3.o srcsamp.o virtuals.o:     ../common/random.h
236  
237 < ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
237 > ambient.o ambcomp.o aniso.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
238   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
239   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
240 < rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
241 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
240 > rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
241 > sphere.o t_data.o t_func.o persist.o duphead.o: ray.h ../common/standard.h \
242 > ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
243  
244 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
244 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
245  
246 < mirror.o source.o srcsupp.o virtuals.o: source.h
246 > m_direct.o m_mirror.o \
247 > source.o srcsamp.o srcsupp.o virtuals.o:        source.h
248  
249 < cone.o data.o devcomm.o initotypes.o \
250 < octree.o:       standard.h mat4.h fvect.h
249 > cone.o data.o devcomm.o freeobjmem.o initotypes.o \
250 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
251  
252   initotypes.o raytrace.o:        otspecial.h
253  
254   sundev.o:       suntools.icon
255  
256 < rpmain.o rtmain.o rvmain.o rpict.o:     view.h
256 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
257  
258   x10.o xtwind.o: xtwind.h
259  
# Line 236 | Line 261 | x11.o x11twind.o: x11twind.h
261  
262   x11.o:  x11icon.h
263  
264 < ambient.o ambcomp.o lookamb.o:  ambient.h
264 > ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
265 >
266 > data.o rmain.o rpict.o rtrace.o rv2.o:  ../common/resolu.h
267 >
268 > aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
269 > p_func.o t_data.o t_func.o:     func.h
270 >
271 > freeobjmem.o:   ../common/object.h
272 >
273 > devcomm.o:      ../common/vfork.h
274 >
275 > rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h

Diff Legend

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