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.63 by greg, Wed Oct 9 12:27:50 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 43 | 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 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 + HEADERS = ambient.h ray.h data.h otspecial.h source.h
81 +
82   #
83   # What this makefile produces:
84   #
# Line 82 | 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 91 | Line 98 | x10:   $(DEVDIR)/x10
98  
99   aed:    $(DEVDIR)/aed
100  
101 + tiff:  
102 +
103   clean:
104          set nonomatch; rm -f $(PROGS) *.o core
105  
# Line 144 | Line 153 | rvmain.o:      rmain.c
153          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
154          mv rmain.o rvmain.o
155  
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   #
165 < #dielectric.o:  dielectric.c source.h
166 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
167 < #
165 > dielectric.o:   dielectric.c source.h
166 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
167 >
168   # end of dispersion compiles.
169  
170   devcomm.o:      devcomm.c
# Line 167 | Line 182 | aed.o: aed.c
182   ambient.o:      ambient.c
183          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
184  
185 < calexpr.o:      calexpr.c calcomp.h
185 > calexpr.o:      calexpr.c ../common/calcomp.h
186          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
187  
188 < caldefn.o:      caldefn.c calcomp.h
189 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
188 > caldefn.o:      caldefn.c ../common/calcomp.h
189 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
190  
176 – calfunc.o:      calfunc.c calcomp.h
177 –        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178 –
191   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
192          $(CC) $(CFLAGS) -c nwsdev.c
193  
# Line 183 | Line 195 | nwsdev.h:      nwsdev.cps newsconstants.h
195          cps nwsdev.cps
196  
197   #
198 < # Include dependencies:
198 > # Version module:
199   #
200  
201 < caldefn.o calexpr.o calfunc.o:  calcomp.h
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 +
209   aed.o colortab.o data.o devcomm.o \
210 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
210 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
211  
212 < o_cone.o srcsupp.o:     cone.h
212 > o_cone.o srcsupp.o:     ../common/cone.h
213  
214   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
215  
216   aed.o devcomm.o devmain.o devtable.o \
217   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
218  
219 < o_face.o srcsupp.o:     face.h
219 > o_face.o srcsupp.o:     ../common/face.h
220  
221   ambient.o raytrace.o rpmain.o rtmain.o \
222 < rtrace.o rvmain.o rv2.o rv3.o source.o: octree.h
222 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
223  
224 < o_instance.o:   instance.h octree.h
224 > o_instance.o:   ../common/instance.h ../common/octree.h
225  
226   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:   otypes.h
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:     random.h
230 > ambient.o ambcomp.o rpict.o rv3.o source.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 standard.h mat4.h fvect.h object.h color.h
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
238  
239 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
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
242  
243   cone.o data.o devcomm.o initotypes.o \
244 < octree.o:       standard.h mat4.h fvect.h
244 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
245  
246   initotypes.o raytrace.o:        otspecial.h
247  
248   sundev.o:       suntools.icon
249  
250 < rpmain.o rtmain.o rvmain.o rpict.o:     view.h
250 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
251  
252   x10.o xtwind.o: xtwind.h
253  

Diff Legend

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