ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/rt/Rmakefile
(Generate patch)

Comparing src/rt/Rmakefile (file contents):
Revision 1.59 by greg, Thu Aug 22 09:25:22 1991 UTC vs.
Revision 1.68 by greg, Thu Nov 7 11:06:53 1991 UTC

# Line 3 | Line 3
3   #  Compiles for ray tracing programs.
4   #
5  
6 < OPT = -O -pipe
7 < MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
6 > OPT = -O
7 > MACH = -DBSD
8   CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9 + SPECIAL = aed
10   CC = cc
11   LINT = lint
12 < LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB
12 > LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
13 > -DINCHAN -DRCONST -DREDEFW
14  
15   #
16   # The following are user-definable:
17   #
18   DESTDIR = .
19 < INSTDIR = /lumen/lumen/ray/bin.sun3
19 > INSTDIR = /usr/local/bin
20   INSTALL = cp
21  
22   #
# Line 42 | Line 43 | DLIBS = -lX11
43   # Standard object files:
44   #
45  
46 < RTOBJS = rtmain.o rtrace.o $(ROBJS)
47 < RTSRC = rmain.c rtrace.c $(RSRC)
46 > RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
47 > RTSRC = rmain.c rtrace.c $(RSRC) Version.c
48  
49 < RPOBJS = rpmain.o rpict.o $(ROBJS)
50 < RPSRC = rmain.c rpict.c $(RSRC)
49 > RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
50 > RPSRC = rmain.c rpict.c $(RSRC) Version.c
51  
52 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
53 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
52 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
53 > RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
54  
55   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56          $(MODOBJS) $(SUPPOBJS)
# Line 59 | Line 60 | RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
60   RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
61   RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
62  
63 < SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
64 <        o_instance.o
63 > SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
64 >        o_cone.o o_instance.o
65   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
66 <                o_cone.c o_instance.c
66 >                srcsamp.c 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          m_direct.o
# Line 72 | Line 73 | MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf
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 func.o noise3.o data.o readfargs.o
77 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c
76 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
77 >        malloc.o
78 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
79 >        malloc.c
80  
81 + HEADERS = ambient.h ray.h data.h otspecial.h source.h
82 +
83   #
84   # What this makefile produces:
85   #
86  
87   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
88  
89 < all:    $(PROGS)
89 > all:    $(PROGS) $(SPECIAL)
90  
91 < install:        $(PROGS) rayinit.cal
91 > install:        $(PROGS) $(SPECIAL) rayinit.cal
92          $(INSTALL) $(PROGS) $(INSTDIR)
93          rm -f $(LIBDIR)/rayinit.cal
94          cp rayinit.cal $(LIBDIR)
# Line 152 | Line 157 | rvmain.o:      rmain.c
157   readfargs.o:    readfargs.c ../common/object.h
158          $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
159  
160 + malloc.o:       malloc.c
161 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
162 +
163   #
164   # Uncomment the following to model dispersion:
165   #
# Line 188 | Line 196 | nwsdev.h:      nwsdev.cps newsconstants.h
196          cps nwsdev.cps
197  
198   #
199 + # Version module:
200 + #
201 +
202 + Version.c:      VERSION $(RSRC) $(HEADERS)
203 +        ( cat VERSION ; date ; whoami ; hostname ) > Version.c
204 +        ed - Version.c < verscript.ed
205 +
206 + #
207   # Include dependencies:
208   #
209  
# Line 212 | Line 228 | 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 < ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
231 > ambient.o ambcomp.o rpict.o rv3.o srcsamp.o:    ../common/random.h
232  
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 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
236 > rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
237 > sphere.o t_data.o t_func.o:     ray.h ../common/standard.h \
238 > ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
239  
240   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
241  
242 < mirror.o source.o srcsupp.o virtuals.o: source.h
242 > mirror.o source.o srcsamp.o srcsupp.o virtuals.o:       source.h
243  
244   cone.o data.o devcomm.o initotypes.o \
245   octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h

Diff Legend

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