| 6 |  | OPT = -O | 
| 7 |  | MACH = -DBSD | 
| 8 |  | CFLAGS = -I../common -L../lib $(OPT) $(MACH) | 
| 9 | < | SPECIAL = aed | 
| 9 | > | SPECIAL = | 
| 10 |  | CC = cc | 
| 11 |  | MLIB = -lm | 
| 12 |  | LINT = lint | 
| 30 |  | # | 
| 31 |  | RLIB = ../lib/libradiance.a | 
| 32 |  | RCLIB = ../lib/libraycalls.a | 
| 33 | < | LIBS = -lrt $(MLIB) | 
| 33 | > | LIBS = -lrtrad $(MLIB) | 
| 34 |  |  | 
| 35 |  | # | 
| 36 |  | # Device drivers for rvu (see also devtable.c): | 
| 54 |  | RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) | 
| 55 |  | RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC) | 
| 56 |  |  | 
| 57 | < | RLOBJS = raycalls.o raypcalls.o | 
| 58 | < | RLSRC = raycalls.c raypcalls.c | 
| 57 | > | RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o | 
| 58 | > | RCSRC = rcmain.c rcontrib.c rc2.c rc3.c | 
| 59 |  |  | 
| 60 | + | RLOBJS = raycalls.o raypcalls.o rayfifo.o | 
| 61 | + | RLSRC = raycalls.c raypcalls.c rayfifo.c | 
| 62 | + |  | 
| 63 |  | ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \ | 
| 64 |  | $(MODOBJS) $(SUPPOBJS) | 
| 65 |  | RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \ | 
| 76 |  | o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c | 
| 77 |  |  | 
| 78 |  | MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \ | 
| 79 | < | m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o | 
| 79 | > | m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o | 
| 80 |  | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \ | 
| 81 | < | m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c | 
| 81 | > | m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c | 
| 82 |  |  | 
| 83 |  | MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o | 
| 84 |  | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c | 
| 92 |  | # What this makefile produces: | 
| 93 |  | # | 
| 94 |  |  | 
| 95 | < | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb | 
| 95 | > | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \ | 
| 96 | > | $(DESTDIR)/lookamb | 
| 97 |  |  | 
| 98 |  | all:    $(PROGS) $(RCLIB) $(SPECIAL) | 
| 99 |  |  | 
| 100 |  | install:        all rayinit.cal | 
| 101 |  | $(INSTALL) $(PROGS) $(INSTDIR) | 
| 102 |  | cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview | 
| 103 | + | cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib | 
| 104 |  | rm -f $(LIBDIR)/rayinit.cal | 
| 105 |  | cp rayinit.cal $(LIBDIR) | 
| 106 |  |  | 
| 102 | – | aed:    $(DEVDIR)/aed | 
| 103 | – |  | 
| 107 |  | ogl: | 
| 108 |  |  | 
| 109 |  | clean: | 
| 116 |  | # Links: | 
| 117 |  | # | 
| 118 |  |  | 
| 119 | < | $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB) | 
| 120 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS) | 
| 119 | > | $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB) | 
| 120 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS) | 
| 121 |  |  | 
| 122 |  | $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB) | 
| 123 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) | 
| 124 |  |  | 
| 125 | < | $(DESTDIR)/rvu: $(RVOBJS) $(RLIB) | 
| 126 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 125 | > | $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB) | 
| 126 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \ | 
| 127 | > | $(RLIB) $(LIBS) $(DLIBS) | 
| 128 |  |  | 
| 129 | + | $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB) | 
| 130 | + | $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) | 
| 131 | + |  | 
| 132 |  | $(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 133 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 134 |  |  | 
| 128 | – | $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o | 
| 129 | – | $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \ | 
| 130 | – | devmain.o tty.o editline.o $(LIBS) | 
| 131 | – |  | 
| 135 |  | $(RLIB):        $(ROBJS) Version.o | 
| 136 | + | rm -f $(RLIB) | 
| 137 |  | ar rc $(RLIB) $(ROBJS) Version.o | 
| 138 |  | -ranlib $(RLIB) | 
| 139 |  |  | 
| 140 |  | $(RCLIB):       $(RLOBJS) | 
| 141 | + | rm -f $(RCLIB) | 
| 142 |  | ar rc $(RCLIB) $(RLOBJS) | 
| 143 |  | -ranlib $(RCLIB) | 
| 144 |  |  | 
| 145 |  | # | 
| 141 | – | # Special compiles: | 
| 142 | – | # | 
| 143 | – |  | 
| 144 | – | rtmain.o:       rtmain.c | 
| 145 | – | $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c | 
| 146 | – |  | 
| 147 | – | rpmain.o:       rpmain.c | 
| 148 | – | $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c | 
| 149 | – |  | 
| 150 | – | rvmain.o:       rvmain.c | 
| 151 | – | $(CC) $(CFLAGS) -c rvmain.c | 
| 152 | – |  | 
| 153 | – | # | 
| 146 |  | # Uncomment the following to model dispersion: | 
| 147 |  | # | 
| 148 |  | dielectric.o:   dielectric.c source.h | 
| 153 |  | devcomm.o:      devcomm.c | 
| 154 |  | $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c | 
| 155 |  |  | 
| 164 | – | aed.o:  aed.c | 
| 165 | – | $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c | 
| 166 | – |  | 
| 156 |  | # | 
| 157 |  | # Version module: | 
| 158 |  | # | 
| 165 |  | # Include dependencies: | 
| 166 |  | # | 
| 167 |  |  | 
| 168 | < | aed.o ambio.o colortab.o data.o devcomm.o \ | 
| 168 | > | ambio.o colortab.o data.o devcomm.o \ | 
| 169 |  | devmain.o lookamb.o rview.o x11.o:      ../common/color.h | 
| 170 |  |  | 
| 171 |  | freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h | 
| 173 |  | data.o freeobjmem.o m_brdf.o mx_data.o \ | 
| 174 |  | p_data.o raycalls.o t_data.o:   data.h | 
| 175 |  |  | 
| 176 | < | aed.o devcomm.o devmain.o devtable.o \ | 
| 177 | < | editline.o tty.o x11.o: driver.h | 
| 176 | > | devcomm.o devmain.o devtable.o \ | 
| 177 | > | editline.o x11.o:       driver.h | 
| 178 |  |  | 
| 179 |  | freeobjmem.o o_face.o srcsupp.o:        ../common/face.h | 
| 180 |  |  | 
| 188 |  | raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ | 
| 189 |  | srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h | 
| 190 |  |  | 
| 191 | < | ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \ | 
| 192 | < | rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 191 | > | ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \ | 
| 192 | > | rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \ | 
| 193 |  | srcsamp.o virtuals.o:   ../common/random.h | 
| 194 |  |  | 
| 195 | < | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \ | 
| 195 | > | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \ | 
| 196 |  | m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ | 
| 197 |  | mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 198 | < | raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 198 | > | raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 199 |  | source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ | 
| 200 | < | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ | 
| 200 | > | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \ | 
| 201 | > | rcontrib.o rc2.o rc3.o: ray.h \ | 
| 202 |  | ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ | 
| 203 | < | ../common/rterror.h ../common/octree.h ../common/tifftypes.h \ | 
| 203 | > | ../common/rterror.h ../common/octree.h \ | 
| 204 |  | ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h | 
| 205 |  |  | 
| 206 |  | rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 207 |  |  | 
| 208 |  | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ | 
| 209 | < | rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \ | 
| 209 | > | rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ | 
| 210 |  | srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 211 |  |  | 
| 212 |  | cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 213 |  | duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \ | 
| 214 | < | ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ | 
| 214 | > | ../common/rtio.h ../common/rtmath.h \ | 
| 215 |  | ../common/rterror.h ../common/mat4.h ../common/fvect.h | 
| 216 |  |  | 
| 217 |  | ambio.o:        ../common/fvect.h | 
| 233 |  | aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ | 
| 234 |  | p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h | 
| 235 |  |  | 
| 236 | < | preload.o:      ../common/object.h ../common/face.h ../common/cone.h \ | 
| 237 | < | ../common/instance.h ../common/mesh.h ../common/color.h data.h | 
| 236 | > | preload.o:      data.h func.h ../common/object.h ../common/face.h \ | 
| 237 | > | ../common/cone.h ../common/instance.h ../common/mesh.h \ | 
| 238 | > | ../common/color.h ../common/bsdf.h ../common/otypes.h | 
| 239 |  |  | 
| 240 |  | rtmain.o rpmain.o rvmain.o persist.o duphead.o \ | 
| 241 |  | renderopts.o rpict.o:   ../common/paths.h | 
| 247 |  | o_mesh.o:       ../common/mesh.h | 
| 248 |  |  | 
| 249 |  | noise3.o:       ../common/calcomp.h | 
| 250 | + |  | 
| 251 | + | aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \ | 
| 252 | + | m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \ | 
| 253 | + | mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ | 
| 254 | + | o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \ | 
| 255 | + | srcobstr.o text.o:              rtotypes.h | 
| 256 | + |  | 
| 257 | + | m_bsdf.o:       ambient.h source.h func.h \ | 
| 258 | + | ../common/calcomp.h ../common/bsdf.h ../common/random.h | 
| 259 | + |  | 
| 260 | + | rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \ | 
| 261 | + | ../common/platform.h ../common/paths.h ../common/lookup.h \ | 
| 262 | + | func.h ../common/calcomp.h ../common/rtprocess.h | 
| 263 | + |  | 
| 264 | + | rcmain.o:       source.h ambient.h | 
| 265 | + |  | 
| 266 | + | rcontrib.o:     source.h ../common/otypes.h | 
| 267 | + |  | 
| 268 | + | rc2.o:  ../common/resolu.h | 
| 269 | + |  | 
| 270 | + | rc3.o:  ../common/selcall.h |