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 1.39 by greg, Thu Mar 7 15:12:09 1991 UTC vs.
Revision 1.62 by greg, Wed Oct 9 10:07:47 1991 UTC

# Line 1 | Line 1
1 – # SCCSid "$SunId$ LBL"
2 –
1   #
2 + # SCCSid "$SunId$ LBL"
3   #  Compiles for ray tracing programs.
4   #
5  
6   OPT = -O -pipe
7   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT)
8 > CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9   CC = cc
10   LINT = lint
11   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
12 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF
12 > -DINCHAN -DRCONST -DREDEFW -DBIGLIB
13  
14   #
15   # The following are user-definable:
# Line 28 | Line 27 | LIBDIR = /usr/local/lib/ray
27   #
28   # Library routines:
29   #
30 < LIBS = -lm
32 < COMPAT = malloc.o
30 > LIBS = -lrt -lm
31  
32   #
33   # Device drivers for rview (see also devtable.c):
34   #
35   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
36          colortab.o
37 < DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
37 > DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
38          colortab.c
39   DLIBS = -lX11
40  
# Line 44 | Line 42 | DLIBS = -lX11
42   # Standard object files:
43   #
44  
45 < RTOBJS = rtmain.o rtrace.o $(ROBJS)
46 < RTSRC = rmain.c rtrace.c $(RSRC)
45 > RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
46 > RTSRC = rmain.c rtrace.c $(RSRC) Version.c
47  
48 < RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
49 < RPSRC = rmain.c rpict.c image.c $(RSRC)
48 > RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
49 > RPSRC = rmain.c rpict.c $(RSRC) Version.c
50  
51 < RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
52 < RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
51 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
52 > RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
53  
54 < ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
55 <        $(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
56 < RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
57 <        $(MODSRC) $(SUPPSRC) $(MISCSRC)
54 > ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
55 >        $(MODOBJS) $(SUPPOBJS)
56 > RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
57 >        $(MODSRC) $(SUPPSRC)
58  
59 < OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
60 < OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
59 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
60 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
61  
62 < RAYOBJS = raytrace.o ambient.o
63 < RAYSRC = raytrace.c ambient.c
62 > SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
63 >        o_instance.o
64 > SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
65 >                o_cone.c o_instance.c
66  
67 < SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
68 <                o_cone.o o_instance.o instance.o
69 < SURFSRC = face.c sphere.c source.c o_face.c cone.c \
70 <                o_cone.c o_instance.c instance.c
67 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
68 >        m_direct.o
69 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
70 >        m_direct.c
71  
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 –
72   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
73   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
74  
75 < SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
75 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
76 >        malloc.o
77 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
78 >        malloc.c
79  
80 < 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
80 > HEADERS = ambient.h ray.h data.h otspecial.h source.h
81  
82   #
83   # What this makefile produces:
# Line 91 | Line 87 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
87  
88   all:    $(PROGS)
89  
90 < install:        $(PROGS)
90 > install:        $(PROGS) rayinit.cal
91          $(INSTALL) $(PROGS) $(INSTDIR)
92 +        rm -f $(LIBDIR)/rayinit.cal
93 +        cp rayinit.cal $(LIBDIR)
94  
95   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
96  
97   x10:    $(DEVDIR)/x10
98  
99 < aed:
102 <        @echo
99 > aed:    $(DEVDIR)/aed
100  
101 + tiff:  
102 +
103   clean:
104 <        rm -f $(PROGS) *.o core
104 >        set nonomatch; rm -f $(PROGS) *.o core
105  
106   lint:   $(RVSRC)
107          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 134 | Line 133 | $(DEVDIR)/x10: x10.o xtwind.o colortab.o devmain.o edi
133          $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
134   colortab.o editline.o -lX $(LIBS)
135  
136 + $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
137 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
138 + devmain.o tty.o editline.o $(LIBS)
139 +
140   #
141   # Special compiles:
142   #
# Line 150 | Line 153 | rvmain.o:      rmain.c
153          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
154          mv rmain.o rvmain.o
155  
156 + readfargs.o:    readfargs.c ../common/object.h
157 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
158 +
159 + malloc.o:       malloc.c
160 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
161 +
162   #
163 < # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
163 > # Uncomment the following to model dispersion:
164   #
165 < #dielectric.o:  dielectric.c source.h
166 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
167 < #
165 > dielectric.o:   dielectric.c source.h
166 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
167 >
168   # end of dispersion compiles.
169  
170   devcomm.o:      devcomm.c
# Line 167 | Line 176 | sundev.o:      sundev.c
176   x10.o:  x10.c
177          $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
178  
179 + aed.o:  aed.c
180 +        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
181 +
182   ambient.o:      ambient.c
183          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
184  
185 < calexpr.o:      calexpr.c calcomp.h
185 > calexpr.o:      calexpr.c ../common/calcomp.h
186          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
187  
188 < caldefn.o:      caldefn.c calcomp.h
188 > caldefn.o:      caldefn.c ../common/calcomp.h
189          $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
190  
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 –
191   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
192          $(CC) $(CFLAGS) -c nwsdev.c
193  
# Line 189 | Line 195 | nwsdev.h:      nwsdev.cps newsconstants.h
195          cps nwsdev.cps
196  
197   #
198 < # Include dependencies:
198 > # Version module:
199   #
200  
201 < caldefn.o calexpr.o calfunc.o:  calcomp.h
201 > Version.c:      VERSION $(RSRC) $(HEADERS) verscript.ed
202 >        cp VERSION Version.c
203 >        ls -lLt $(RSRC) $(HEADERS) >> Version.c
204 >        ed - Version.c < verscript.ed
205  
206 < aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
207 < devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
206 > #
207 > # Include dependencies:
208 > #
209  
210 < cone.o o_cone.o source.o:       cone.h
210 > aed.o colortab.o data.o devcomm.o \
211 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
212  
213 + o_cone.o srcsupp.o:     ../common/cone.h
214 +
215   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
216  
217   aed.o devcomm.o devmain.o devtable.o \
218   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
219  
220 < face.o o_face.o source.o:       face.h
220 > o_face.o srcsupp.o:     ../common/face.h
221  
222 < fvect.o:        fvect.h
222 > ambient.o raytrace.o rpmain.o rtmain.o \
223 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
224  
225 < cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
225 > o_instance.o:   ../common/instance.h ../common/octree.h
226  
227 < ambient.o objset.o octree.o raytrace.o readoct.o \
228 < rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
227 > ambient.o dielectric.o func.o initotypes.o m_brdf.o \
228 > normal.o o_cone.o text.o raytrace.o rtrace.o \
229 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
230  
231 < o_instance.o instance.o:        instance.h octree.h
231 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
232  
233 < 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 \
233 > ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
234   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
235   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
236 < rtrace.o rv2.o rv3.o source.o sphere.o \
237 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
236 > rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
237 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
238 > ../common/fvect.h ../common/object.h ../common/color.h
239  
240 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
240 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
241  
242 < source.o:       source.h
242 > mirror.o source.o srcsupp.o virtuals.o: source.h
243  
244 < cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
245 < octree.o otypes.o readobj.o readoct.o rview.o:  standard.h mat4.h fvect.h
244 > cone.o data.o devcomm.o initotypes.o \
245 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
246  
247 < mat4.o:         mat4.h fvect.h
247 > initotypes.o raytrace.o:        otspecial.h
248  
249   sundev.o:       suntools.icon
250  
251 < image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
251 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
252  
253   x10.o xtwind.o: xtwind.h
254  
255   x11.o x11twind.o: x11twind.h
256 +
257 + x11.o:  x11icon.h
258 +
259 + ambient.o ambcomp.o lookamb.o:  ambient.h

Diff Legend

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