Mercurial > octave-libtiff

changeset 24101:e5a504929efb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: delete generated makefile snippets on 'make maintainer-clean' * doc/interpreter/images.awk: Emit assignment to include the generated images.mk in the doc_MAINTAINERCLEANFILES variable. * libinterp/dldfcn/config-module.awk: Emit assignment to include the generated module.mk in the libinterp_MAINTAINERCLEANFILES variable. * liboctave/operators/config-ops.sh: Emit assignments to include each generated makefile snippet in the liboctave_MAINTAINERCLEANFILES variable.
author Mike Miller <mtmiller@octave.org>
date Mon, 25 Sep 2017 14:59:19 -0700
parents 4d9ceaf17dda
children c723faa56ab4
files doc/interpreter/images.awk libinterp/dldfcn/config-module.awk liboctave/operators/config-ops.sh
diffstat 3 files changed, 30 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/images.awk	Fri Sep 22 17:24:15 2017 -0700
+++ b/doc/interpreter/images.awk	Mon Sep 25 14:59:19 2017 -0700
@@ -54,4 +54,6 @@
 }
 END {
   print "endif";
+  print "";
+  print "doc_MAINTAINERCLEANFILES += $(srcdir)/%reldir%/images.mk";
 }
--- a/libinterp/dldfcn/config-module.awk	Fri Sep 22 17:24:15 2017 -0700
+++ b/libinterp/dldfcn/config-module.awk	Mon Sep 25 14:59:19 2017 -0700
@@ -89,4 +89,6 @@
   print "";
   print "$(srcdir)/%reldir%/module.mk: $(srcdir)/%reldir%/config-module.sh $(srcdir)/%reldir%/config-module.awk $(srcdir)/%reldir%/module-files";
   print "\t$(AM_V_GEN)$(SHELL) $(srcdir)/%reldir%/config-module.sh $(srcdir)";
+  print "";
+  print "libinterp_MAINTAINERCLEANFILES += $(srcdir)/%reldir%/module.mk";
 }
--- a/liboctave/operators/config-ops.sh	Fri Sep 22 17:24:15 2017 -0700
+++ b/liboctave/operators/config-ops.sh	Mon Sep 25 14:59:19 2017 -0700
@@ -43,6 +43,8 @@
 
 move_if_change="$top_srcdir/build-aux/move-if-change"
 
+clean_varname="liboctave_MAINTAINERCLEANFILES"
+
 liboctave_dir="$top_srcdir/liboctave/operators"
 
 mk_ops="$liboctave_dir/mk-ops.awk"
@@ -51,9 +53,11 @@
   vx | all)
     case "$src_type" in
       inc | all)
+        fn=vx-op-inc.mk
         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
-        $SHELL $move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk
+        echo "VX_OP_INC = $VX_INC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;
@@ -63,9 +67,11 @@
   vx | all)
     case "$src_type" in
       src | all)
+        fn=vx-op-src.mk
         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
-        $SHELL $move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk
+        echo "VX_OP_SRC = $VX_SRC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;
@@ -75,9 +81,11 @@
   mx | all)
     case "$src_type" in
       inc | all)
+        fn=mx-op-inc.mk
         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
-        $SHELL $move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk
+        echo "MX_OP_INC = $MX_INC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;
@@ -87,9 +95,11 @@
   mx | all)
     case "$src_type" in
       src | all)
+        fn=mx-op-src.mk
         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
-        $SHELL $move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk
+        echo "MX_OP_SRC = $MX_SRC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;
@@ -99,9 +109,11 @@
   smx | all)
     case "$src_type" in
       inc | all)
+        fn=smx-op-inc.mk
         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
-        $SHELL $move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk
+        echo "SMX_OP_INC = $SMX_INC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;
@@ -111,9 +123,11 @@
   smx | all)
     case "$src_type" in
       src | all)
+        fn=smx-op-src.mk
         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
-        $SHELL $move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk
+        echo "SMX_OP_SRC = $SMX_SRC" > $liboctave_dir/$fn-t
+        echo "$clean_varname += \$(srcdir)/%reldir%/$fn" >> $liboctave_dir/$fn-t
+        $SHELL $move_if_change $liboctave_dir/$fn-t $liboctave_dir/$fn
       ;;
     esac
   ;;