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.22 by greg, Tue Mar 6 17:44:35 1990 UTC vs.
Revision 1.36 by greg, Thu Dec 13 10:43:59 1990 UTC

# Line 4 | Line 4
4   #  Compiles for ray tracing programs.
5   #
6  
7 < OPT = -O
7 > OPT = -O -pipe
8   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9   CFLAGS = $(MACH) $(OPT)
10 + CC = cc
11 + LINT = lint
12 + LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 + -DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF
14  
15   #
16   # The following are user-definable:
# Line 18 | Line 22 | INSTALL = cp
22   #
23   # The following paths must exist and be relative to root:
24   #
25 < DEVDIR = $(INSTDIR)
25 > DEVDIR = $(INSTDIR)/dev
26   LIBDIR = /usr/local/lib/ray
27  
28   #
# Line 31 | Line 35 | COMPAT = malloc.o
35   # Device drivers for rview (see also devtable.c):
36   #
37   DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
38 <        colortab.o
39 < DLIBS = -lX
40 < DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
38 >        colortab.o nwsdev.o
39 > DSRC = devtable.c devcomm.c aed.c tty.c editline.c x10.c xtwind.c \
40 >        colortab.c nwsdev.c
41 > DLIBS = -lX -lcps
42 > DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
43  
44   #
45   # Standard object files:
46   #
47  
48   RTOBJS = rtmain.o rtrace.o $(ROBJS)
49 + RTSRC = rmain.c rtrace.c $(RSRC)
50  
51   RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
52 + RPSRC = rmain.c rpict.c image.c $(RSRC)
53  
54   RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
55 + RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
56  
57   ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
58          $(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
59 + RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
60 +        $(MODSRC) $(SUPPSRC) $(MISCSRC)
61  
62 < OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o
62 > OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
63 > OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
64  
65   RAYOBJS = raytrace.o ambient.o
66 + RAYSRC = raytrace.c ambient.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
72  
73 < MATOBJS = normal.o dielectric.o m_clip.o glass.o
73 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
74 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c
75  
76   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
77 + MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
78  
79   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
80 + SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
81  
82 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
83 <                fgetline.o ealloc.o
82 > MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
83 >                color.o resolu.o
84 > MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
85 >                color.c resolu.c
86  
87   #
88   # What this makefile produces:
# Line 78 | Line 98 | install:       all
98   clean:
99          rm -f *.o core
100  
101 + lint:   $(RVSRC)
102 +        $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
103 +
104   #
105   # Links:
106   #
107  
108   $(DESTDIR)/rtrace:      $(RTOBJS)
109 <        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
109 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
110  
111   $(DESTDIR)/rpict:       $(RPOBJS)
112 <        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
112 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
113  
114   $(DESTDIR)/rview:       $(RVOBJS)
115 <        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
115 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
116  
117   $(DESTDIR)/lookamb:     lookamb.o
118 <        cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
118 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
119  
120 < $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o editline.o
121 <        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
120 > $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
121 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
122   editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
123  
124   $(DEVDIR)/sun.com:      suncom.o editline.o
125 <        cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
125 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
126  
127 < $(DEVDIR)/x11dev:       x11.o x11twind.o colortab.o devmain.o editline.o
128 <        cc $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
127 > $(DEVDIR)/x11:  x11.o x11twind.o colortab.o devmain.o editline.o
128 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x11 x11.o x11twind.o devmain.o \
129   colortab.o editline.o -lX11 $(LIBS)
130  
131   #
# Line 110 | Line 133 | colortab.o editline.o -lX11 $(LIBS)
133   #
134  
135   rtmain.o:       rmain.c
136 <        cc $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
136 >        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
137          mv rmain.o rtmain.o
138  
139   rpmain.o:       rmain.c
140 <        cc $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
140 >        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
141          mv rmain.o rpmain.o
142  
143   rvmain.o:       rmain.c
144 <        cc $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
144 >        $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
145          mv rmain.o rvmain.o
146  
147   #
148 < # Uncomment the following to model dispersion:
148 > # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
149   #
150   #dielectric.o:  dielectric.c source.h
151 < #       cc $(CFLAGS) -DDISPERSE -c dielectric.c
151 > #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
152   #
130 – #color.o:       color.c color.h
131 – #       cc $(CFLAGS) -DSPEC_RGB -c color.c
132 – #
153   # end of dispersion compiles.
154  
155 + devcomm.o:      devcomm.c
156 +        $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
157 +
158   sundev.o:       sundev.c
159 <        cc $(CFLAGS) -Dsun_init=dinit -c 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
162 >        $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
163  
164   ambient.o:      ambient.c
165 <        cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
165 >        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
166  
167   calexpr.o:      calexpr.c calcomp.h
168 <        cc $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
168 >        $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
169  
170   caldefn.o:      caldefn.c calcomp.h
171 <        cc $(CFLAGS) -DFUNCTION -c caldefn.c
171 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
172  
173   calfunc.o:      calfunc.c calcomp.h
174 <        cc $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
174 >        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
175  
176   xf.o:   xf.c
177 <        cc $(CFLAGS) -DINVXF -c xf.c
177 >        $(CC) $(CFLAGS) -DINVXF -c xf.c
178  
179 + nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
180 +        $(CC) $(CFLAGS) -c nwsdev.c
181 +
182 + nwsdev.h:       nwsdev.cps newsconstants.h
183 +        cps nwsdev.cps
184 +
185   #
186   # Include dependencies:
187   #
188  
189   caldefn.o calexpr.o calfunc.o:  calcomp.h
190  
191 < aed.o color.o colortab.o data.o devcomm.o \
192 < devmain.o lookamb.o rview.o sundev.o x10.o:     color.h
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
193  
194   cone.o o_cone.o source.o:       cone.h
195  
196   data.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 sundev.o tty.o x10.o:        driver.h
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
202  
# Line 175 | Line 204 | fvect.o:       fvect.h
204  
205   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
206  
207 < ambient.o objset.o octree.o raytrace.o \
208 < readoct.o rmain.o rv2.o rv3.o source.o: octree.h
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
209  
210   o_instance.o instance.o:        instance.h octree.h
211  
212 < ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
213 < text.o raytrace.o readobj.o readoct.o rtrace.o \
212 > ambient.o cone.o dielectric.o func.o initotypes.o normal.o o_cone.o \
213 > objset.o otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
214   rv2.o source.o sphere.o:        otypes.h
215  
216   ambient.o rpict.o rv3.o source.o:       random.h
217  
218   ambient.o dielectric.o func.o glass.o m_clip.o \
219   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
220 < p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
220 > p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
221   rtrace.o rv2.o rv3.o source.o \
222   sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
223  
# Line 196 | Line 225 | rv2.o rv3.o rview.o:   rpaint.h driver.h view.h
225  
226   source.o:       source.h
227  
228 < cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
229 < readobj.o readoct.o rview.o:    standard.h fvect.h
228 > cone.o data.o devcomm.o face.o image.o initotypes.o misc.o objset.o \
229 > octree.o otypes.o readobj.o readoct.o rview.o:  standard.h fvect.h
230  
231   sundev.o:       suntools.icon
232  
233 < image.o rmain.o rpict.o:        view.h
233 > image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
234  
235   x10.o xtwind.o: xtwind.h
236  

Diff Legend

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