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.33 by greg, Wed Oct 31 14:19:15 1990 UTC vs.
Revision 1.52 by greg, Mon Jul 15 12:18:13 1991 UTC

# Line 5 | Line 5
5   #
6  
7   OPT = -O -pipe
8 < MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9 < CFLAGS = $(MACH) $(OPT)
8 > MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
9 > CFLAGS = $(MACH) $(OPT) -I../common
10   CC = cc
11 + LINT = lint
12 + LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 + -DINCHAN -DRCONST -DREDEFW -DBIGLIB
14  
15   #
16   # The following are user-definable:
17   #
18   DESTDIR = .
19 < INSTDIR = /usr/local/ray
19 > INSTDIR = /lumen/lumen/ray/bin.sun3
20   INSTALL = cp
21  
22   #
# Line 25 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = -lm
29 < 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 aed.o tty.o editline.o x10.o xtwind.o \
37 <        colortab.o nwsdev.o
38 < DLIBS = -lX -lcps
39 < DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
36 > DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
37 >        colortab.o
38 > DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
39 >        colortab.c
40 > DLIBS = -lX11
41  
42   #
43   # Standard object files:
44   #
45  
46   RTOBJS = rtmain.o rtrace.o $(ROBJS)
47 + RTSRC = rmain.c rtrace.c $(RSRC)
48  
49 < RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
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)
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)
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
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
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
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
70  
59 – MATOBJS = normal.o dielectric.o m_clip.o glass.o
60 –
71   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
72 + MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
73  
74   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
75 + SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
76  
65 – MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
66 –                color.o resolu.o
67 –
77   #
78   # What this makefile produces:
79   #
80  
81   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
82  
83 < all:    $(PROGS) $(DRIVERS)
83 > all:    $(PROGS)
84  
85 < install:        all
85 > install:        $(PROGS)
86          $(INSTALL) $(PROGS) $(INSTDIR)
87  
88 + sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
89 +
90 + x10:    $(DEVDIR)/x10
91 +
92 + aed:    $(DEVDIR)/aed
93 +
94   clean:
95 <        rm -f *.o core
95 >        set nonomatch; rm -f $(PROGS) *.o core
96  
97 + lint:   $(RVSRC)
98 +        $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
99 +
100   #
101   # Links:
102   #
# Line 102 | Line 120 | editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
120   $(DEVDIR)/sun.com:      suncom.o editline.o
121          $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
122  
123 < $(DEVDIR)/x11:  x11.o x11twind.o colortab.o devmain.o editline.o
124 <        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x11 x11.o x11twind.o devmain.o \
125 < colortab.o editline.o -lX11 $(LIBS)
123 > $(DEVDIR)/x10:  x10.o xtwind.o colortab.o devmain.o editline.o
124 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
125 > colortab.o editline.o -lX $(LIBS)
126  
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   #
132   # Special compiles:
133   #
# Line 123 | Line 145 | rvmain.o:      rmain.c
145          mv rmain.o rvmain.o
146  
147   #
148 < # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
148 > # Uncomment the following to model dispersion:
149   #
150   #dielectric.o:  dielectric.c source.h
151   #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
# Line 136 | Line 158 | devcomm.o:     devcomm.c
158   sundev.o:       sundev.c
159          $(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
160  
161 < x11.o:  x11.c
162 <        $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
161 > x10.o:  x10.c
162 >        $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
163  
164 + aed.o:  aed.c
165 +        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
166 +
167   ambient.o:      ambient.c
168          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
169  
# Line 146 | Line 171 | calexpr.o:     calexpr.c calcomp.h
171          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
172  
173   caldefn.o:      caldefn.c calcomp.h
174 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
174 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
175  
176   calfunc.o:      calfunc.c calcomp.h
177          $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178  
154 – xf.o:   xf.c
155 –        $(CC) $(CFLAGS) -DINVXF -c xf.c
156 –
179   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
180          $(CC) $(CFLAGS) -c nwsdev.c
181  
# Line 166 | Line 188 | nwsdev.h:      nwsdev.cps newsconstants.h
188  
189   caldefn.o calexpr.o calfunc.o:  calcomp.h
190  
191 < aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
192 < devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
191 > aed.o colortab.o data.o devcomm.o \
192 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
193  
194 < cone.o o_cone.o source.o:       cone.h
194 > o_cone.o srcsupp.o:     cone.h
195  
196 < data.o mx_data.o p_data.o t_data.o:     data.h
196 > data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
197  
198   aed.o devcomm.o devmain.o devtable.o \
199   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
200  
201 < face.o o_face.o source.o:       face.h
201 > o_face.o srcsupp.o:     ../common/face.h
202  
203 < fvect.o:        fvect.h
203 > ambient.o raytrace.o rpmain.o rtmain.o \
204 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
205  
206 < cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
206 > o_instance.o:   ../common/instance.h ../common/octree.h
207  
208 < ambient.o objset.o octree.o raytrace.o readoct.o \
209 < rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
208 > ambient.o dielectric.o func.o initotypes.o m_brdf.o \
209 > normal.o o_cone.o text.o raytrace.o rtrace.o \
210 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
211  
212 < o_instance.o instance.o:        instance.h octree.h
212 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
213  
214 < ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
215 < otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
192 < rv2.o source.o sphere.o:        otypes.h
193 <
194 < ambient.o rpict.o rv3.o source.o:       random.h
195 <
196 < ambient.o dielectric.o func.o glass.o m_clip.o \
197 < mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
214 > ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
215 > m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
216   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
217 < rtrace.o rv2.o rv3.o source.o \
218 < sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
217 > rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
218 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
219 > ../common/fvect.h ../common/object.h ../common/color.h
220  
221 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
221 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
222  
223 < source.o:       source.h
223 > mirror.o source.o srcsupp.o virtuals.o: source.h
224  
225 < cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
226 < readobj.o readoct.o rview.o:    standard.h fvect.h
225 > cone.o data.o devcomm.o initotypes.o \
226 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
227  
228 + initotypes.o raytrace.o:        otspecial.h
229 +
230   sundev.o:       suntools.icon
231  
232 < image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
232 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
233  
234   x10.o xtwind.o: xtwind.h
235  
236   x11.o x11twind.o: x11twind.h
237 +
238 + x11.o:  x11icon.h
239 +
240 + ambient.o ambcomp.o lookamb.o:  ambient.h

Diff Legend

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