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.39 by greg, Thu Mar 7 15:12:09 1991 UTC vs.
Revision 1.55 by greg, Wed Jul 17 12:15:29 1991 UTC

# Line 6 | Line 6
6  
7   OPT = -O -pipe
8   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
9 < CFLAGS = $(MACH) $(OPT)
9 > CFLAGS = $(MACH) $(OPT) -I../common
10   CC = cc
11   LINT = lint
12   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF
13 > -DINCHAN -DRCONST -DREDEFW -DBIGLIB
14  
15   #
16   # The following are user-definable:
# Line 28 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = -lm
32 < COMPAT = malloc.o
31 > LIBS = ../common/librt.a -lm
32  
33   #
34   # Device drivers for rview (see also devtable.c):
35   #
36   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
37          colortab.o
38 < DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
38 > DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
39          colortab.c
40   DLIBS = -lX11
41  
# Line 47 | Line 46 | DLIBS = -lX11
46   RTOBJS = rtmain.o rtrace.o $(ROBJS)
47   RTSRC = rmain.c rtrace.c $(RSRC)
48  
49 < RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
50 < RPSRC = rmain.c rpict.c image.c $(RSRC)
49 > RPOBJS = rpmain.o rpict.o $(ROBJS)
50 > RPSRC = rmain.c rpict.c $(RSRC)
51  
52 < RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
53 < RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
52 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
53 > RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
54  
55 < ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56 <        $(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
57 < RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
58 <        $(MODSRC) $(SUPPSRC) $(MISCSRC)
55 > ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56 >        $(MODOBJS) $(SUPPOBJS)
57 > RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
58 >        $(MODSRC) $(SUPPSRC)
59  
60 < OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
61 < OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
60 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
61 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
62  
63 < RAYOBJS = raytrace.o ambient.o
64 < RAYSRC = raytrace.c ambient.c
63 > SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
64 >        o_instance.o
65 > SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
66 >                o_cone.c o_instance.c
67  
68 < SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
69 <                o_cone.o o_instance.o instance.o
70 < SURFSRC = face.c sphere.c source.c o_face.c cone.c \
71 <                o_cone.c o_instance.c instance.c
68 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
69 >        m_direct.o
70 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
71 >        m_direct.c
72  
72 – MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
73 – MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c
74 –
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
77 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
78  
81 – MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
82 –                color.o resolu.o
83 – MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
84 –                color.c resolu.c
85 –
79   #
80   # What this makefile produces:
81   #
# Line 98 | Line 91 | sun:   $(DEVDIR)/sun $(DEVDIR)/sun.com
91  
92   x10:    $(DEVDIR)/x10
93  
94 < aed:
102 <        @echo
94 > aed:    $(DEVDIR)/aed
95  
96   clean:
97 <        rm -f $(PROGS) *.o core
97 >        set nonomatch; rm -f $(PROGS) *.o core
98  
99   lint:   $(RVSRC)
100          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 120 | Line 112 | $(DESTDIR)/rpict:      $(RPOBJS)
112   $(DESTDIR)/rview:       $(RVOBJS)
113          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
114  
115 + $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview:    ../common/librt.a
116 +
117   $(DESTDIR)/lookamb:     lookamb.o
118          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
119  
# Line 134 | Line 128 | $(DEVDIR)/x10: x10.o xtwind.o colortab.o devmain.o edi
128          $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
129   colortab.o editline.o -lX $(LIBS)
130  
131 + $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
132 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
133 + devmain.o tty.o editline.o $(LIBS)
134 +
135   #
136   # Special compiles:
137   #
# Line 151 | Line 149 | rvmain.o:      rmain.c
149          mv rmain.o rvmain.o
150  
151   #
152 < # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
152 > # Uncomment the following to model dispersion:
153   #
154 < #dielectric.o:  dielectric.c source.h
155 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
156 < #
154 > dielectric.o:   dielectric.c source.h
155 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
156 >
157   # end of dispersion compiles.
158  
159   devcomm.o:      devcomm.c
# Line 167 | Line 165 | sundev.o:      sundev.c
165   x10.o:  x10.c
166          $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
167  
168 + aed.o:  aed.c
169 +        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
170 +
171   ambient.o:      ambient.c
172          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
173  
174 < calexpr.o:      calexpr.c calcomp.h
174 > calexpr.o:      calexpr.c ../common/calcomp.h
175          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
176  
177 < caldefn.o:      caldefn.c calcomp.h
177 > caldefn.o:      caldefn.c ../common/calcomp.h
178          $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
179  
179 – calfunc.o:      calfunc.c calcomp.h
180 –        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
181 –
182 – xf.o:   xf.c
183 –        $(CC) $(CFLAGS) -DINVXF -c xf.c
184 –
180   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
181          $(CC) $(CFLAGS) -c nwsdev.c
182  
# Line 192 | Line 187 | nwsdev.h:      nwsdev.cps newsconstants.h
187   # Include dependencies:
188   #
189  
190 < caldefn.o calexpr.o calfunc.o:  calcomp.h
190 > aed.o colortab.o data.o devcomm.o \
191 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
192  
193 < aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
198 < devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
193 > o_cone.o srcsupp.o:     ../common/cone.h
194  
200 – cone.o o_cone.o source.o:       cone.h
201 –
195   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
196  
197   aed.o devcomm.o devmain.o devtable.o \
198   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
199  
200 < face.o o_face.o source.o:       face.h
200 > o_face.o srcsupp.o:     ../common/face.h
201  
202 < fvect.o:        fvect.h
202 > ambient.o raytrace.o rpmain.o rtmain.o \
203 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
204  
205 < cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
205 > o_instance.o:   ../common/instance.h ../common/octree.h
206  
207 < ambient.o objset.o octree.o raytrace.o readoct.o \
208 < rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
207 > ambient.o dielectric.o func.o initotypes.o m_brdf.o \
208 > normal.o o_cone.o text.o raytrace.o rtrace.o \
209 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
210  
211 < o_instance.o instance.o:        instance.h octree.h
211 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
212  
213 < ambient.o cone.o dielectric.o func.o initotypes.o m_brdf.o normal.o o_cone.o \
219 < objset.o otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
220 < rv2.o source.o sphere.o:        otypes.h
221 <
222 < ambient.o rpict.o rv3.o source.o:       random.h
223 <
224 < ambient.o dielectric.o func.o glass.o m_clip.o \
213 > ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
214   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
215   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
216 < rtrace.o rv2.o rv3.o source.o sphere.o \
217 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
216 > rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
217 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
218 > ../common/fvect.h ../common/object.h ../common/color.h
219  
220 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
220 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
221  
222 < source.o:       source.h
222 > mirror.o source.o srcsupp.o virtuals.o: source.h
223  
224 < cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
225 < octree.o otypes.o readobj.o readoct.o rview.o:  standard.h mat4.h fvect.h
224 > cone.o data.o devcomm.o initotypes.o \
225 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
226  
227 < mat4.o:         mat4.h fvect.h
227 > initotypes.o raytrace.o:        otspecial.h
228  
229   sundev.o:       suntools.icon
230  
231 < image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
231 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
232  
233   x10.o xtwind.o: xtwind.h
234  
235   x11.o x11twind.o: x11twind.h
236 +
237 + x11.o:  x11icon.h
238 +
239 + ambient.o ambcomp.o lookamb.o:  ambient.h

Diff Legend

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