--- ray/test/renders/Makefile 2018/11/17 22:09:12 1.1 +++ ray/test/renders/Makefile 2018/11/17 23:22:43 1.2 @@ -1,4 +1,4 @@ -# RCSid $Id: Makefile,v 1.1 2018/11/17 22:09:12 greg Exp $ +# RCSid $Id: Makefile,v 1.2 2018/11/17 23:22:43 greg Exp $ # # Render and primitive type testing # @@ -17,7 +17,7 @@ test-tfunc-def test-tfunc-fish test-trans-def test-tra test-trans2-def test-trans2-fish clean: - rm -f *.oct *.amb *.dat *_*.hdr + rm -f *.oct *.amb *.dat *_*.hdr *.unf ### Reference and test for dielectric view def ### @@ -53,7 +53,7 @@ test-glass-def: ref/glass_def.hdr glass_def.hdr $(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr - ref/glass_def.hdr: - make -s glass_def.hdr + make glass_def.hdr $(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr glass_def.hdr: glass.rif @@ -67,7 +67,7 @@ test-glass-fish: ref/glass_fish.hdr glass_fish.hdr $(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr - ref/glass_fish.hdr: - make -s glass_fish.hdr + make glass_fish.hdr $(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr glass_fish.hdr: glass.rif @@ -81,7 +81,7 @@ test-glass-up: ref/glass_up.hdr glass_up.hdr $(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr - ref/glass_up.hdr: - make -s glass_up.hdr + make glass_up.hdr $(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr glass_up.hdr: glass.rif @@ -95,7 +95,7 @@ test-inst-def: ref/inst_def.hdr inst_def.hdr $(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr - ref/inst_def.hdr: - make -s inst_def.hdr + make inst_def.hdr $(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr inst_def.hdr: inst.rif @@ -109,7 +109,7 @@ test-inst-fish: ref/inst_fish.hdr inst_fish.hdr $(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr - ref/inst_fish.hdr: - make -s inst_fish.hdr + make inst_fish.hdr $(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr inst_fish.hdr: inst.rif @@ -123,7 +123,7 @@ test-mesh-def: ref/mesh_def.hdr mesh_def.hdr $(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr - ref/mesh_def.hdr: - make -s mesh_def.hdr + make mesh_def.hdr $(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr mesh_def.hdr: mesh.rif @@ -137,7 +137,7 @@ test-mesh-cyl: ref/mesh_cyl.hdr mesh_cyl.hdr $(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr - ref/mesh_cyl.hdr: - make -s mesh_cyl.hdr + make mesh_cyl.hdr $(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr mesh_cyl.hdr: mesh.rif @@ -151,7 +151,7 @@ test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr $(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr - ref/mesh_cyl2.hdr: - make -s mesh_cyl2.hdr + make mesh_cyl2.hdr $(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr mesh_cyl2.hdr: mesh.rif @@ -165,7 +165,7 @@ test-mirror-fish: ref/mirror_fish.hdr mirror_fish.hdr $(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr - ref/mirror_fish.hdr: - make -s mirror_fish.hdr + make mirror_fish.hdr $(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr mirror_fish.hdr: mirror.rif @@ -179,7 +179,7 @@ test-mist-def: ref/mist_def.hdr mist_def.hdr $(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr - ref/mist_def.hdr: - make -s mist_def.hdr + make mist_def.hdr $(RDU_PFILT) mist_def.hdr > ref/mist_def.hdr mist_def.hdr: mist.rif @@ -193,7 +193,7 @@ test-prism1-fish: ref/prism1_fish.hdr prism1_fish.hdr $(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr - ref/prism1_fish.hdr: - make -s prism1_fish.hdr + make prism1_fish.hdr $(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr prism1_fish.hdr: prism1.rif @@ -207,7 +207,7 @@ test-prism2-fish: ref/prism2_fish.hdr prism2_fish.hdr $(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr - ref/prism2_fish.hdr: - make -s prism2_fish.hdr + make prism2_fish.hdr $(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr prism2_fish.hdr: prism2.rif @@ -221,7 +221,7 @@ test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr $(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr - ref/tfunc_def.hdr: - make -s tfunc_def.hdr + make tfunc_def.hdr $(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr tfunc_def.hdr: tfunc.rif @@ -235,7 +235,7 @@ test-tfunc-fish: ref/tfunc_fish.hdr tfunc_fish.hdr $(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr - ref/tfunc_fish.hdr: - make -s tfunc_fish.hdr + make tfunc_fish.hdr $(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr tfunc_fish.hdr: tfunc.rif @@ -249,7 +249,7 @@ test-trans-def: ref/trans_def.hdr trans_def.hdr $(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr - ref/trans_def.hdr: - make -s trans_def.hdr + make trans_def.hdr $(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr trans_def.hdr: trans.rif @@ -263,7 +263,7 @@ test-trans-fish: ref/trans_fish.hdr trans_fish.hdr $(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr - ref/trans_fish.hdr: - make -s trans_fish.hdr + make trans_fish.hdr $(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr trans_fish.hdr: trans.rif @@ -277,7 +277,7 @@ test-trans2-def: ref/trans2_def.hdr trans2_def.hdr $(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr - ref/trans2_def.hdr: - make -s trans2_def.hdr + make trans2_def.hdr $(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr trans2_def.hdr: trans2.rif @@ -291,7 +291,7 @@ test-trans2-fish: ref/trans2_fish.hdr trans2_fish.hdr $(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr - ref/trans2_fish.hdr: - make -s trans2_fish.hdr + make trans2_fish.hdr $(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr trans2_fish.hdr: trans2.rif @@ -305,7 +305,7 @@ test-trans2-win: ref/trans2_win.hdr trans2_win.hdr $(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr - ref/trans2_win.hdr: - make -s trans2_win.hdr + make trans2_win.hdr $(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr trans2_win.hdr: trans2.rif