| 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 | 
| 29 |  | # Library routines: | 
| 30 |  | # | 
| 31 |  | RLIB = ../lib/libradiance.a | 
| 32 | + | RCLIB = ../lib/libraycalls.a | 
| 33 |  | LIBS = -lrt $(MLIB) | 
| 34 |  |  | 
| 35 |  | # | 
| 36 | < | # Device drivers for rview (see also devtable.c): | 
| 36 | > | # Device drivers for rvu (see also devtable.c): | 
| 37 |  | # | 
| 38 |  | DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \ | 
| 39 |  | colortab.o | 
| 67 |  | RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \ | 
| 68 |  | preload.c raytrace.c renderopts.c | 
| 69 |  |  | 
| 70 | < | SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \ | 
| 71 | < | o_cone.o o_instance.o o_mesh.o | 
| 72 | < | SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \ | 
| 73 | < | srcsamp.c o_cone.c o_instance.c o_mesh.c | 
| 70 | > | SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \ | 
| 71 | > | o_face.o o_cone.o o_instance.o o_mesh.o | 
| 72 | > | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \ | 
| 73 | > | o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c | 
| 74 |  |  | 
| 75 |  | MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \ | 
| 76 |  | m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o | 
| 89 |  | # What this makefile produces: | 
| 90 |  | # | 
| 91 |  |  | 
| 92 | < | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb | 
| 92 | > | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb | 
| 93 |  |  | 
| 94 | < | all:    $(PROGS) $(SPECIAL) $(RLOBJS) | 
| 94 | > | all:    $(PROGS) $(RCLIB) $(SPECIAL) | 
| 95 |  |  | 
| 96 |  | install:        all rayinit.cal | 
| 97 |  | $(INSTALL) $(PROGS) $(INSTDIR) | 
| 98 | < | cp $(RLOBJS) ../lib | 
| 98 | > | cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview | 
| 99 |  | rm -f $(LIBDIR)/rayinit.cal | 
| 100 |  | cp rayinit.cal $(LIBDIR) | 
| 101 |  |  | 
| 101 | – | aed:    $(DEVDIR)/aed | 
| 102 | – |  | 
| 102 |  | ogl: | 
| 103 |  |  | 
| 104 |  | clean: | 
| 117 |  | $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB) | 
| 118 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) | 
| 119 |  |  | 
| 120 | < | $(DESTDIR)/rview:       $(RVOBJS) $(RLIB) | 
| 121 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 120 | > | $(DESTDIR)/rvu: $(RVOBJS) $(RLIB) | 
| 121 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 122 |  |  | 
| 123 |  | $(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 124 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 125 |  |  | 
| 127 | – | $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o | 
| 128 | – | $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \ | 
| 129 | – | devmain.o tty.o editline.o $(LIBS) | 
| 130 | – |  | 
| 126 |  | $(RLIB):        $(ROBJS) Version.o | 
| 127 |  | ar rc $(RLIB) $(ROBJS) Version.o | 
| 128 |  | -ranlib $(RLIB) | 
| 129 |  |  | 
| 130 | + | $(RCLIB):       $(RLOBJS) | 
| 131 | + | ar rc $(RCLIB) $(RLOBJS) | 
| 132 | + | -ranlib $(RCLIB) | 
| 133 | + |  | 
| 134 |  | # | 
| 135 |  | # Special compiles: | 
| 136 |  | # | 
| 155 |  | devcomm.o:      devcomm.c | 
| 156 |  | $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c | 
| 157 |  |  | 
| 159 | – | aed.o:  aed.c | 
| 160 | – | $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c | 
| 161 | – |  | 
| 158 |  | # | 
| 159 |  | # Version module: | 
| 160 |  | # | 
| 167 |  | # Include dependencies: | 
| 168 |  | # | 
| 169 |  |  | 
| 170 | < | aed.o ambio.o colortab.o data.o devcomm.o \ | 
| 170 | > | ambio.o colortab.o data.o devcomm.o \ | 
| 171 |  | devmain.o lookamb.o rview.o x11.o:      ../common/color.h | 
| 172 |  |  | 
| 173 |  | freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h | 
| 175 |  | data.o freeobjmem.o m_brdf.o mx_data.o \ | 
| 176 |  | p_data.o raycalls.o t_data.o:   data.h | 
| 177 |  |  | 
| 178 | < | aed.o devcomm.o devmain.o devtable.o \ | 
| 179 | < | editline.o tty.o x11.o: driver.h | 
| 178 | > | devcomm.o devmain.o devtable.o \ | 
| 179 | > | editline.o x11.o:       driver.h | 
| 180 |  |  | 
| 181 |  | freeobjmem.o o_face.o srcsupp.o:        ../common/face.h | 
| 182 |  |  | 
| 183 |  | ambient.o raytrace.o rpmain.o rtmain.o \ | 
| 184 | < | rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h | 
| 184 | > | rtrace.o rvmain.o rv2.o rv3.o:  ../common/octree.h | 
| 185 |  |  | 
| 186 |  | o_instance.o:   ../common/instance.h | 
| 187 |  |  | 
| 188 |  | ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \ | 
| 189 |  | m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \ | 
| 190 |  | raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ | 
| 191 | < | virtuals.o:     ../common/otypes.h | 
| 191 | > | srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h | 
| 192 |  |  | 
| 193 |  | ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \ | 
| 194 |  | rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 198 |  | m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ | 
| 199 |  | mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 200 |  | raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 201 | < | source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \ | 
| 202 | < | rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:        ray.h \ | 
| 203 | < | ../common/standard.h ../common/octree.h \ | 
| 201 | > | source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ | 
| 202 | > | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ | 
| 203 | > | ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ | 
| 204 | > | ../common/rterror.h ../common/octree.h ../common/tifftypes.h \ | 
| 205 |  | ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h | 
| 206 |  |  | 
| 207 |  | rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 208 |  |  | 
| 209 |  | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ | 
| 210 | < | source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 210 | > | rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ | 
| 211 | > | srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 212 |  |  | 
| 213 |  | cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 214 | < | duphead.o octree.o:     ../common/standard.h ../common/mat4.h ../common/fvect.h | 
| 214 | > | duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \ | 
| 215 | > | ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ | 
| 216 | > | ../common/rterror.h ../common/mat4.h ../common/fvect.h | 
| 217 |  |  | 
| 218 |  | ambio.o:        ../common/fvect.h | 
| 219 |  |  | 
| 220 | < | initotypes.o raytrace.o:        otspecial.h | 
| 220 | > | initotypes.o srcobstr.o raytrace.o:     otspecial.h | 
| 221 |  |  | 
| 222 |  | rpmain.o rtmain.o rvmain.o rpict.o \ | 
| 223 |  | srcdraw.o:      ../common/view.h ../common/resolu.h | 
| 232 |  | rv2.o:  ../common/resolu.h | 
| 233 |  |  | 
| 234 |  | aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ | 
| 235 | < | p_func.o t_data.o t_func.o:     func.h | 
| 235 | > | p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h | 
| 236 |  |  | 
| 237 |  | preload.o:      ../common/object.h ../common/face.h ../common/cone.h \ | 
| 238 |  | ../common/instance.h ../common/mesh.h ../common/color.h data.h | 
| 239 |  |  | 
| 240 | < | devcomm.o:      ../common/vfork.h | 
| 240 | > | rtmain.o rpmain.o rvmain.o persist.o duphead.o \ | 
| 241 | > | renderopts.o rpict.o:   ../common/paths.h | 
| 242 |  |  | 
| 242 | – | rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h | 
| 243 | – |  | 
| 243 |  | freeobjmem.o raycalls.o text.o: ../common/font.h | 
| 244 |  |  | 
| 245 |  | raypcalls.o:    ../common/selcall.h | 
| 246 |  |  | 
| 247 |  | o_mesh.o:       ../common/mesh.h | 
| 248 | + |  | 
| 249 | + | noise3.o:       ../common/calcomp.h |