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.57 by greg, Fri Aug 16 12:54:48 1991 UTC vs.
Revision 1.65 by greg, Tue Oct 22 15:45:17 1991 UTC

# Line 5 | Line 5
5  
6   OPT = -O -pipe
7   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT) -I../common
8 > CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9   CC = cc
10   LINT = lint
11   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
# Line 27 | 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 42 | Line 42 | DLIBS = -lX11
42   # Standard object files:
43   #
44  
45 < RTOBJS = rtmain.o rtrace.o $(ROBJS)
46 < RTSRC = rmain.c rtrace.c $(RSRC)
45 > RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
46 > RTSRC = rmain.c rtrace.c $(RSRC) Version.c
47  
48 < RPOBJS = rpmain.o rpict.o $(ROBJS)
49 < RPSRC = rmain.c rpict.c $(RSRC)
48 > RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
49 > RPSRC = rmain.c rpict.c $(RSRC) Version.c
50  
51 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
52 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
51 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
52 > RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
53  
54   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
55          $(MODOBJS) $(SUPPOBJS)
# Line 59 | Line 59 | RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
59   RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
60   RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
61  
62 < SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
63 <        o_instance.o
62 > SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
63 >        o_cone.o o_instance.o
64   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
65 <                o_cone.c o_instance.c
65 >                srcsamp.c 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          m_direct.o
# Line 72 | Line 72 | MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf
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 func.o noise3.o data.o readfargs.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.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 + HEADERS = ambient.h ray.h data.h otspecial.h source.h
81 +
82   #
83   # What this makefile produces:
84   #
# Line 83 | Line 87 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
87  
88   all:    $(PROGS)
89  
90 < install:        $(PROGS)
90 > install:        $(PROGS) rayinit.cal
91          $(INSTALL) $(PROGS) $(INSTDIR)
92 +        rm -f $(LIBDIR)/rayinit.cal
93 +        cp rayinit.cal $(LIBDIR)
94  
95   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
96  
# Line 104 | Line 110 | lint:  $(RVSRC)
110   # Links:
111   #
112  
113 < $(DESTDIR)/rtrace:      $(RTOBJS) ../common/librt.a
113 > $(DESTDIR)/rtrace:      $(RTOBJS)
114          $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
115  
116 < $(DESTDIR)/rpict:       $(RPOBJS) ../common/librt.a
116 > $(DESTDIR)/rpict:       $(RPOBJS)
117          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
118  
119 < $(DESTDIR)/rview:       $(RVOBJS) ../common/librt.a
119 > $(DESTDIR)/rview:       $(RVOBJS)
120          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
121  
122   $(DESTDIR)/lookamb:     lookamb.o
# Line 150 | Line 156 | rvmain.o:      rmain.c
156   readfargs.o:    readfargs.c ../common/object.h
157          $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
158  
159 + malloc.o:       malloc.c
160 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
161 +
162   #
163   # Uncomment the following to model dispersion:
164   #
# Line 186 | Line 195 | nwsdev.h:      nwsdev.cps newsconstants.h
195          cps nwsdev.cps
196  
197   #
198 + # Version module:
199 + #
200 +
201 + Version.c:      VERSION $(RSRC) $(HEADERS)
202 +        ( cat VERSION ; date ; whoami ; hostname ) > Version.c
203 +        ed - Version.c < verscript.ed
204 +
205 + #
206   # Include dependencies:
207   #
208  
# Line 210 | Line 227 | ambient.o dielectric.o func.o initotypes.o m_brdf.o \
227   normal.o o_cone.o text.o raytrace.o rtrace.o \
228   rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
229  
230 < ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
230 > ambient.o ambcomp.o rpict.o rv3.o srcsamp.o:    ../common/random.h
231  
232   ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
233   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
234   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
235 < rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
236 < t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
237 < ../common/fvect.h ../common/object.h ../common/color.h
235 > rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
236 > sphere.o t_data.o t_func.o:     ray.h ../common/standard.h \
237 > ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
238  
239   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
240  
241 < mirror.o source.o srcsupp.o virtuals.o: source.h
241 > mirror.o source.o srcsamp.o srcsupp.o virtuals.o:       source.h
242  
243   cone.o data.o devcomm.o initotypes.o \
244   octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h

Diff Legend

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