--- ray/src/rt/Rmakefile 2016/09/29 21:51:58 2.79 +++ ray/src/rt/Rmakefile 2021/01/19 23:31:47 2.87 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.79 2016/09/29 21:51:58 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.87 2021/01/19 23:31:47 greg Exp $ # # Compiles for ray tracing programs. # @@ -8,6 +8,7 @@ MACH = -DBSD CFLAGS = -I../common -L../lib $(OPT) $(MACH) SPECIAL = CC = cc +AR = ar MLIB = -lm LINT = lint LINTFLAGS = -DBSD @@ -110,8 +111,6 @@ all: $(PROGS) $(RCLIB) $(SPECIAL) install: all rayinit.cal $(INSTALL) $(PROGS) $(INSTDIR) - cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview - cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib rm -f $(LIBDIR)/rayinit.cal cp rayinit.cal $(LIBDIR) @@ -151,12 +150,12 @@ $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o $(RLIB): $(ROBJS) Version.o rm -f $(RLIB) - ar rc $(RLIB) $(ROBJS) Version.o + $(AR) rc $(RLIB) $(ROBJS) Version.o -ranlib $(RLIB) $(RCLIB): $(RLOBJS) rm -f $(RCLIB) - ar rc $(RCLIB) $(RLOBJS) + $(AR) rc $(RCLIB) $(RLOBJS) -ranlib $(RCLIB) # @@ -176,7 +175,7 @@ devcomm.o: devcomm.c Version.c: VERSION $(RSRC) $(HEADERS) ( cat VERSION ; date ; whoami ; hostname ) > Version.c - ed - Version.c < verscript.ed + ed - Version.c < verscript.ed || rm Version.c # # Include dependencies: @@ -201,9 +200,9 @@ rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h o_instance.o: ../common/instance.h ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \ -initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \ -raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ -srcdraw.o srcobstr.o virtuals.o: ../common/otypes.h +initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \ +preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \ +srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o: ../common/otypes.h ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \ rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \ @@ -223,7 +222,7 @@ rcontrib.o rc2.o rc3.o: ray.h \ rv2.o rv3.o rview.o: rpaint.h driver.h ../common/view.h ../common/resolu.h m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ -rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ +rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \ srcobstr.o srcsamp.o srcsupp.o virtuals.o: source.h cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ @@ -233,7 +232,10 @@ duphead.o octree.o: ../common/standard.h ../common/rtm ambio.o: ../common/fvect.h -initotypes.o srcobstr.o raytrace.o: otspecial.h +ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \ +pmapooc.o pmapsrc.o pmcontrib2.o \ +raytrace.o rtrace.o rv2.o rv3.o source.o \ +srcdraw.o srcobstr.o virtuals.o: otspecial.h rpmain.o rtmain.o rvmain.o rpict.o \ srcdraw.o: ../common/view.h ../common/resolu.h @@ -280,8 +282,10 @@ rcmain.o rcontrib.o rc2.o rc3.o: rcontrib.h \ ../common/platform.h ../common/paths.h ../common/lookup.h \ func.h ../common/calcomp.h ../common/rtprocess.h -rcmain.o: source.h ambient.h +ambient.o rcmain.o: ambient.h +rcmain.o: source.h + rcontrib.o: source.h ../common/otypes.h rc2.o: ../common/resolu.h @@ -326,30 +330,30 @@ pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ../common/standard.h ../common/copyright.h ../common/rtio.h \ ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ ../common/fvect.h ../common/rterror.h ../common/octree.h \ - ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \ - pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \ - ../common/platform.h ../common/otypes.h + ../common/object.h ../common/color.h ../common/paths.h \ + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \ + pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h -pmapcontrib.o pmcontrib2.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \ +pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \ ../common/standard.h ../common/copyright.h ../common/rtio.h \ ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ ../common/fvect.h ../common/rterror.h ../common/octree.h \ ../common/object.h ../common/color.h pmapparm.h pmaptype.h \ - ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \ - pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \ + ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \ + pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \ + rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \ + ../common/calcomp.h ../common/otypes.h + +pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \ + ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \ + ../common/otypes.h source.h rcontrib.h ../common/platform.h \ ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \ - ../common/otypes.h + ../common/random.h pmapkdt.c pmapooc.c -pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \ - pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c oococt.h oocnn.h ooccache.h \ - ../common/standard.h ../common/copyright.h ../common/rtio.h \ - ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ - ../common/fvect.h ../common/rterror.h ../common/octree.h \ - ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \ - pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \ - ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \ - ../common/calcomp.h - pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \ ../common/standard.h ../common/copyright.h ../common/rtio.h \ ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ @@ -368,8 +372,9 @@ pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ ../common/rterror.h ../common/octree.h ../common/object.h \ - ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \ - ../common/platform.h ../common/resolu.h + ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \ + ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \ + ../common/resolu.h pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \ ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \ @@ -386,7 +391,8 @@ pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata. ../common/standard.h ../common/copyright.h ../common/rtio.h \ ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ ../common/fvect.h ../common/rterror.h ../common/octree.h \ - ../common/object.h ../common/color.h ../common/lookup.h + ../common/object.h ../common/color.h ../common/paths.h \ + ../common/lookup.h pmapkdt.h pmapooc.h pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \ ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ @@ -403,10 +409,18 @@ pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar ../common/lookup.h pmaprand.h ../common/otypes.h pmutil.o: pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \ -../common/otypes.h + ../common/otypes.h pmaptype.o: pmaptype.c pmaptype.h +mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h ../common/paths.h \ + ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \ + ambient.h ../common/resolu.h source.h + oococt.o: oococt.c oococt.h oocsort.h ooccache.h \ ../common/rtio.h ../common/fvect.h