diff liboctave/operators/config-ops.sh @ 21247:7be239ae42c8

merge sparse-mk-ops.awk and mk-ops.awk scripts * mx-ops.awk: Merge with sparse-mk-ops.awk. Generate a single output file at a time and always write to stdout. * sparse-mk-ops.awk: Delete. * liboctave/module.mk, liboctave/operators/module.mk: Adapt rules. * liboctave/operators/config-ops.sh: Update for modified mk-ops.awk script. * mx-ops, smx-ops, vx-ops: Improve comments.
author John W. Eaton <jwe@octave.org>
date Thu, 11 Feb 2016 02:36:54 -0500
parents e195d8408ce8
children 1bca6c72d2b1
line wrap: on
line diff
--- a/liboctave/operators/config-ops.sh	Wed Feb 10 17:42:51 2016 -0800
+++ b/liboctave/operators/config-ops.sh	Thu Feb 11 02:36:54 2016 -0500
@@ -27,13 +27,12 @@
 liboctave_dir="$top_srcdir/liboctave/operators"
 
 mk_ops="$liboctave_dir/mk-ops.awk"
-sparse_mk_ops="$liboctave_dir/sparse-mk-ops.awk"
 
 case "$obj_type" in
   vx | all)
     case "$src_type" in
       inc | all)
-        VX_INC=$($AWK -f $mk_ops prefix=vx list_h_files=1 $liboctave_dir/vx-ops)
+        VX_INC=$($AWK -f $mk_ops -v prefix=vx -v list_h_files=1 $liboctave_dir/vx-ops)
         echo "VX_OP_INC = $VX_INC" > $liboctave_dir/vx-op-inc.mk-t
         $move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk
       ;;
@@ -45,7 +44,7 @@
   vx | all)
     case "$src_type" in
       src | all)
-        VX_SRC=$($AWK -f $mk_ops prefix=vx list_cc_files=1 $liboctave_dir/vx-ops)
+        VX_SRC=$($AWK -f $mk_ops -v prefix=vx -v list_cc_files=1 $liboctave_dir/vx-ops)
         echo "VX_OP_SRC = $VX_SRC" > $liboctave_dir/vx-op-src.mk-t
         $move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk
       ;;
@@ -57,7 +56,7 @@
   mx | all)
     case "$src_type" in
       inc | all)
-        MX_INC=$($AWK -f $mk_ops prefix=mx list_h_files=1 $liboctave_dir/mx-ops)
+        MX_INC=$($AWK -f $mk_ops -v prefix=mx -v list_h_files=1 $liboctave_dir/mx-ops)
         echo "MX_OP_INC = $MX_INC" > $liboctave_dir/mx-op-inc.mk-t
         $move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk
       ;;
@@ -69,7 +68,7 @@
   mx | all)
     case "$src_type" in
       src | all)
-        MX_SRC=$($AWK -f $mk_ops prefix=mx list_cc_files=1 $liboctave_dir/mx-ops)
+        MX_SRC=$($AWK -f $mk_ops -v prefix=mx -v list_cc_files=1 $liboctave_dir/mx-ops)
         echo "MX_OP_SRC = $MX_SRC" > $liboctave_dir/mx-op-src.mk-t
         $move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk
       ;;
@@ -81,7 +80,7 @@
   smx | all)
     case "$src_type" in
       inc | all)
-        SMX_INC=$($AWK -f $sparse_mk_ops prefix=smx list_h_files=1 $liboctave_dir/smx-ops)
+        SMX_INC=$($AWK -f $mk_ops -v prefix=smx -v list_h_files=1 $liboctave_dir/smx-ops)
         echo "SMX_OP_INC = $SMX_INC" > $liboctave_dir/smx-op-inc.mk-t
         $move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk
       ;;
@@ -93,7 +92,7 @@
   smx | all)
     case "$src_type" in
       src | all)
-        SMX_SRC=$($AWK -f $sparse_mk_ops prefix=smx list_cc_files=1 $liboctave_dir/smx-ops)
+        SMX_SRC=$($AWK -f $mk_ops -v prefix=smx -v list_cc_files=1 $liboctave_dir/smx-ops)
         echo "SMX_OP_SRC = $SMX_SRC" > $liboctave_dir/smx-op-src.mk-t
         $move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk
       ;;