From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 31 Jul 2012 15:28:36 +0000 (+0200)
Subject: [ng] rename: verbatim makefile fragments: *.am -> *.mk
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1619dbfd872096fdf45e5bb654229d3a11203f;p=thirdparty%2Fautomake.git

[ng] rename: verbatim makefile fragments: *.am -> *.mk

Makes clear and manifest the fact that they are not parsed like the
other '*.am' files are (for variable and rule definitions, processing
of Automake conditionals, etc.), rather included almost verbatim (the
"almost" being the stripping of '##'-comments).

* automake.in (verbatim): Expect a suffix of '.mk', not '.am'.
* lib/am/texibuild.am: Rename ...
* lib/am/texibuild.mk: ... like this.
* lib/am/clean.am: Rename ...
* lib/am/clean.mk: ... like this.
* lib/am/check-typos.am: Rename ...
* lib/am/check-typos.mk: ... like this.
* lib/am/color-tests.am: Rename ...
* lib/am/color-tests.mk: ... like this.
* lib/am/parallel-tests.am: Rename ...
* lib/am/parallel-tests.mk: ... like this.
* lib/am/serial-tests.am: Rename ...
* lib/am/serial-tests.mk: ... like this.
* lib/am/header-vars.am: Rename ...
* lib/am/header-vars.mk: ... like this.
* lib/am/am-dir.am: Rename ...
* lib/am/am-dir.mk: ... like this.
* lib/am/common-targets.am: Rename ...
* lib/am/common-targets.mk: ... like this.
* Makefile.am (dist_am_DATA): Adjust.
* t/am-xargs-map.sh: Likewise.
* t/ensure-dir-exists.sh: Likewise.
* t/internals.tap: Likewise.
* t/memoize.tap: Likewise.
* t/verbatim.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index b1dc7e9e3..eab05c363 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,13 +185,15 @@ EXTRA_DIST += lib/Automake/Config.in
 ## --------------------- ##
 
 dist_am_DATA = \
-  lib/am/am-dir.am \
-  lib/am/common-targets.am \
-  lib/am/serial-tests.am \
-  lib/am/parallel-tests.am \
-  lib/am/check-typos.am \
-  lib/am/color-tests.am \
-  lib/am/clean.am \
+  lib/am/am-dir.mk \
+  lib/am/texibuild.mk \
+  lib/am/common-targets.mk \
+  lib/am/color-tests.mk \
+  lib/am/serial-tests.mk \
+  lib/am/parallel-tests.mk \
+  lib/am/check-typos.mk \
+  lib/am/clean.mk \
+  lib/am/header-vars.mk \
   lib/am/compile.am \
   lib/am/configure.am \
   lib/am/data.am \
@@ -199,7 +201,6 @@ dist_am_DATA = \
   lib/am/depend2.am \
   lib/am/distdir.am \
   lib/am/footer.am \
-  lib/am/header-vars.am \
   lib/am/header.am \
   lib/am/inst-vars.am \
   lib/am/java.am \
@@ -221,7 +222,6 @@ dist_am_DATA = \
   lib/am/tags.am \
   lib/am/texi-vers.am \
   lib/am/texi-spec.am \
-  lib/am/texibuild.am \
   lib/am/texinfos.am \
   lib/am/vala.am \
   lib/am/yacc.am
diff --git a/automake.in b/automake.in
index 27074b009..796ef45e6 100644
--- a/automake.in
+++ b/automake.in
@@ -5779,7 +5779,7 @@ sub almost_verbatim ($%)
 
 # verbatim ($NAME)
 # ----------------
-# Load a "$libdir/am/$NAME.am", stripping any '##'-style comment.  No
+# Load a "$libdir/am/$NAME.mk", stripping any '##'-style comment.  No
 # extra parsing or post-processing is done (i.e., recognition of rules
 # declaration or of make variables definitions).
 # If used in scalar or list context, return the read makefile fragment.
@@ -5788,7 +5788,7 @@ sub almost_verbatim ($%)
 sub verbatim ($)
 {
   my $name = shift;
-  my $text .= slurp_makefile_fragment ("$libdir/am/$name.am");
+  my $text .= slurp_makefile_fragment ("$libdir/am/$name.mk");
   if (defined wantarray)
     {
       # Scalar or list context.
diff --git a/lib/am/am-dir.am b/lib/am/am-dir.mk
similarity index 100%
rename from lib/am/am-dir.am
rename to lib/am/am-dir.mk
diff --git a/lib/am/check-typos.am b/lib/am/check-typos.mk
similarity index 100%
rename from lib/am/check-typos.am
rename to lib/am/check-typos.mk
diff --git a/lib/am/clean.am b/lib/am/clean.mk
similarity index 100%
rename from lib/am/clean.am
rename to lib/am/clean.mk
diff --git a/lib/am/color-tests.am b/lib/am/color-tests.mk
similarity index 100%
rename from lib/am/color-tests.am
rename to lib/am/color-tests.mk
diff --git a/lib/am/common-targets.am b/lib/am/common-targets.mk
similarity index 100%
rename from lib/am/common-targets.am
rename to lib/am/common-targets.mk
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.mk
similarity index 100%
rename from lib/am/header-vars.am
rename to lib/am/header-vars.mk
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.mk
similarity index 100%
rename from lib/am/parallel-tests.am
rename to lib/am/parallel-tests.mk
diff --git a/lib/am/serial-tests.am b/lib/am/serial-tests.mk
similarity index 100%
rename from lib/am/serial-tests.am
rename to lib/am/serial-tests.mk
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.mk
similarity index 100%
rename from lib/am/texibuild.am
rename to lib/am/texibuild.mk
diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh
index 3d5db397e..e2bbdd0b1 100755
--- a/t/am-xargs-map.sh
+++ b/t/am-xargs-map.sh
@@ -21,7 +21,7 @@ am_create_testdir=empty
 . ./defs || exit 1
 
 # Filter out Automake comments.
-grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
+grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
 sed 's/^[0-9][0-9]*:://' > Makefile << 'END'
diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index 5911c0bc6..28f6c4b09 100755
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -20,7 +20,7 @@ am_create_testdir=empty
 . ./defs || exit 1
 
 # Filter out Automake comments.
-grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
+grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
 cat > Makefile << 'END'
diff --git a/t/internals.tap b/t/internals.tap
index 91449a0db..31b939c83 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -22,7 +22,7 @@ am_create_testdir=empty
 plan_ 12
 
 # Filter out Automake comments.
-grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
+grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
 # WARNING: there are a lot of embedded tabs in the makefile
diff --git a/t/memoize.tap b/t/memoize.tap
index d829918b0..36f98a293 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -24,7 +24,7 @@ plan_ 17
 ocwd=$(pwd) || fatal_ "couldn't get current working directory"
 
 # Filter out Automake comments.
-grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
+grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
 T ()
diff --git a/t/verbatim.sh b/t/verbatim.sh
index 4921f2639..761b301b4 100755
--- a/t/verbatim.sh
+++ b/t/verbatim.sh
@@ -42,6 +42,7 @@ esac
 
 mkdir am
 cp "$am_amdir"/*.am ./am
+cp "$am_amdir"/*.mk ./am
 
 echo pkgdata_DATA = configure.ac > Makefile.am