summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2017-08-31 14:42:13 +0200
committerMathieu Lirzin <mthl@gnu.org>2017-08-31 14:50:04 +0200
commite94c0186d98d70df2f18c17622ee75f80f95e17b (patch)
tree61f3ceff175cdf0665d5efd4e8124ae33a5e45a2
parente679a5c26ef31e028b7418da467eb72caafaf75c (diff)
downloadautomake-e94c0186d98d70df2f18c17622ee75f80f95e17b.tar.gz
build: Rename "Makefile.inc" Makefile fragments to "local.mk"
This is done to follow a convention used by a lot of GNU packages. * bin/Makefile.inc: Rename to ... * bin/local.mk: ... this. * doc/Makefile.inc: Rename to ... * doc/local.mk: ... this. * lib/Automake/Makefile.inc: Rename to ... * lib/Automake/local.mk: ... this. * lib/am/Makefile.inc: Rename to ... * lib/am/local.mk: ... this. * lib/Makefile.inc: Rename to ... * lib/local.mk: ... this. * m4/Makefile.inc: Rename to ... * m4/local.mk: ... this. * contrib/t/Makefile.inc: Rename to ... * contrib/t/local.mk: ... this. * t/Makefile.inc: Rename to ... * t/local.mk: ... this. Adapt. * Makefile.am: Adapt.
-rw-r--r--Makefile.am14
-rw-r--r--bin/local.mk (renamed from bin/Makefile.inc)0
-rw-r--r--contrib/t/local.mk (renamed from contrib/t/Makefile.inc)0
-rw-r--r--doc/local.mk (renamed from doc/Makefile.inc)0
-rw-r--r--lib/Automake/local.mk (renamed from lib/Automake/Makefile.inc)0
-rw-r--r--lib/am/local.mk (renamed from lib/am/Makefile.inc)0
-rw-r--r--lib/local.mk (renamed from lib/Makefile.inc)0
-rw-r--r--m4/local.mk (renamed from m4/Makefile.inc)0
-rw-r--r--t/local.mk (renamed from t/Makefile.inc)2
9 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index ab6533ea9..89de362de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,12 +123,12 @@ EXTRA_DIST += \
maintainer/syntax-checks.mk
# Most work delegated to sub-dir makefile fragments.
-include $(srcdir)/bin/Makefile.inc
-include $(srcdir)/doc/Makefile.inc
-include $(srcdir)/lib/Makefile.inc
-include $(srcdir)/lib/Automake/Makefile.inc
-include $(srcdir)/lib/am/Makefile.inc
-include $(srcdir)/m4/Makefile.inc
-include $(srcdir)/t/Makefile.inc
+include $(srcdir)/bin/local.mk
+include $(srcdir)/doc/local.mk
+include $(srcdir)/lib/local.mk
+include $(srcdir)/lib/Automake/local.mk
+include $(srcdir)/lib/am/local.mk
+include $(srcdir)/m4/local.mk
+include $(srcdir)/t/local.mk
# vim: ft=automake noet
diff --git a/bin/Makefile.inc b/bin/local.mk
index c63f670b8..c63f670b8 100644
--- a/bin/Makefile.inc
+++ b/bin/local.mk
diff --git a/contrib/t/Makefile.inc b/contrib/t/local.mk
index d55fb9583..d55fb9583 100644
--- a/contrib/t/Makefile.inc
+++ b/contrib/t/local.mk
diff --git a/doc/Makefile.inc b/doc/local.mk
index 807c29308..807c29308 100644
--- a/doc/Makefile.inc
+++ b/doc/local.mk
diff --git a/lib/Automake/Makefile.inc b/lib/Automake/local.mk
index c0d8a4729..c0d8a4729 100644
--- a/lib/Automake/Makefile.inc
+++ b/lib/Automake/local.mk
diff --git a/lib/am/Makefile.inc b/lib/am/local.mk
index 270bb7347..270bb7347 100644
--- a/lib/am/Makefile.inc
+++ b/lib/am/local.mk
diff --git a/lib/Makefile.inc b/lib/local.mk
index 50035de60..50035de60 100644
--- a/lib/Makefile.inc
+++ b/lib/local.mk
diff --git a/m4/Makefile.inc b/m4/local.mk
index eb5702742..eb5702742 100644
--- a/m4/Makefile.inc
+++ b/m4/local.mk
diff --git a/t/Makefile.inc b/t/local.mk
index 6b3b62fed..d5fd00cb1 100644
--- a/t/Makefile.inc
+++ b/t/local.mk
@@ -100,7 +100,7 @@ $(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part
$(srcdir)/%D%/testsuite-part.am: Makefile.am
# Hand-written tests for stuff in 'contrib/'.
-include $(srcdir)/contrib/%D%/Makefile.inc
+include $(srcdir)/contrib/%D%/local.mk
TESTS += $(contrib_TESTS)
EXTRA_DIST += $(contrib_TESTS)