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.51 by greg, Mon Jul 15 11:50:26 1991 UTC vs.
Revision 1.61 by greg, Tue Oct 8 15:32:43 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 \
# Line 28 | Line 27 | LIBDIR = /usr/local/lib/ray
27   #
28   # Library routines:
29   #
30 < LIBS = ../common/librt.a -lm
30 > LIBS = -lrt -lm
31  
32   #
33   # Device drivers for rview (see also devtable.c):
# Line 65 | Line 64 | SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_fa
64   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
65                  o_cone.c o_instance.c
66  
67 < MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
68 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.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   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   #
81   # What this makefile produces:
# Line 82 | Line 85 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
85  
86   all:    $(PROGS)
87  
88 < install:        $(PROGS)
88 > install:        $(PROGS) rayinit.cal
89          $(INSTALL) $(PROGS) $(INSTDIR)
90 +        rm -f $(LIBDIR)/rayinit.cal
91 +        cp rayinit.cal $(LIBDIR)
92  
93   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
94  
# Line 91 | Line 96 | x10:   $(DEVDIR)/x10
96  
97   aed:    $(DEVDIR)/aed
98  
99 + tiff:  
100 +
101   clean:
102          set nonomatch; rm -f $(PROGS) *.o core
103  
# Line 144 | Line 151 | rvmain.o:      rmain.c
151          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
152          mv rmain.o rvmain.o
153  
154 + readfargs.o:    readfargs.c ../common/object.h
155 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
156 +
157 + malloc.o:       malloc.c
158 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
159 +
160   #
161   # Uncomment the following to model dispersion:
162   #
163 < #dielectric.o:  dielectric.c source.h
164 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
165 < #
163 > dielectric.o:   dielectric.c source.h
164 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
165 >
166   # end of dispersion compiles.
167  
168   devcomm.o:      devcomm.c
# Line 167 | Line 180 | aed.o: aed.c
180   ambient.o:      ambient.c
181          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
182  
183 < calexpr.o:      calexpr.c calcomp.h
183 > calexpr.o:      calexpr.c ../common/calcomp.h
184          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
185  
186 < caldefn.o:      caldefn.c calcomp.h
187 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
186 > caldefn.o:      caldefn.c ../common/calcomp.h
187 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
188  
176 – calfunc.o:      calfunc.c calcomp.h
177 –        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178 –
189   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
190          $(CC) $(CFLAGS) -c nwsdev.c
191  
# Line 186 | Line 196 | nwsdev.h:      nwsdev.cps newsconstants.h
196   # Include dependencies:
197   #
198  
189 – caldefn.o calexpr.o calfunc.o:  calcomp.h
190 –
199   aed.o colortab.o data.o devcomm.o \
200 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
200 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
201  
202 < o_cone.o srcsupp.o:     cone.h
202 > o_cone.o srcsupp.o:     ../common/cone.h
203  
204   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
205  
206   aed.o devcomm.o devmain.o devtable.o \
207   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
208  
209 < o_face.o srcsupp.o:     face.h
209 > o_face.o srcsupp.o:     ../common/face.h
210  
211   ambient.o raytrace.o rpmain.o rtmain.o \
212 < rtrace.o rvmain.o rv2.o rv3.o source.o: octree.h
212 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
213  
214 < o_instance.o:   instance.h octree.h
214 > o_instance.o:   ../common/instance.h ../common/octree.h
215  
216   ambient.o dielectric.o func.o initotypes.o m_brdf.o \
217   normal.o o_cone.o text.o raytrace.o rtrace.o \
218 < rv2.o source.o srcsupp.o virtuals.o sphere.o:   otypes.h
218 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
219  
220 < ambient.o ambcomp.o rpict.o rv3.o source.o:     random.h
220 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
221  
222   ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
223   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
224   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
225   rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
226 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
226 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
227 > ../common/fvect.h ../common/object.h ../common/color.h
228  
229 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
229 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
230  
231   mirror.o source.o srcsupp.o virtuals.o: source.h
232  
233   cone.o data.o devcomm.o initotypes.o \
234 < octree.o:       standard.h mat4.h fvect.h
234 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
235  
236   initotypes.o raytrace.o:        otspecial.h
237  
238   sundev.o:       suntools.icon
239  
240 < rpmain.o rtmain.o rvmain.o rpict.o:     view.h
240 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
241  
242   x10.o xtwind.o: xtwind.h
243  

Diff Legend

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