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

Diff Legend

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