From e94c0186d98d70df2f18c17622ee75f80f95e17b Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Thu, 31 Aug 2017 14:42:13 +0200 Subject: [PATCH] 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. --- Makefile.am | 14 +++++++------- bin/{Makefile.inc => local.mk} | 0 contrib/t/{Makefile.inc => local.mk} | 0 doc/{Makefile.inc => local.mk} | 0 lib/Automake/{Makefile.inc => local.mk} | 0 lib/am/{Makefile.inc => local.mk} | 0 lib/{Makefile.inc => local.mk} | 0 m4/{Makefile.inc => local.mk} | 0 t/{Makefile.inc => local.mk} | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename bin/{Makefile.inc => local.mk} (100%) rename contrib/t/{Makefile.inc => local.mk} (100%) rename doc/{Makefile.inc => local.mk} (100%) rename lib/Automake/{Makefile.inc => local.mk} (100%) rename lib/am/{Makefile.inc => local.mk} (100%) rename lib/{Makefile.inc => local.mk} (100%) rename m4/{Makefile.inc => local.mk} (100%) rename t/{Makefile.inc => local.mk} (99%) 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 similarity index 100% rename from bin/Makefile.inc rename to bin/local.mk diff --git a/contrib/t/Makefile.inc b/contrib/t/local.mk similarity index 100% rename from contrib/t/Makefile.inc rename to contrib/t/local.mk diff --git a/doc/Makefile.inc b/doc/local.mk similarity index 100% rename from doc/Makefile.inc rename to doc/local.mk diff --git a/lib/Automake/Makefile.inc b/lib/Automake/local.mk similarity index 100% rename from lib/Automake/Makefile.inc rename to lib/Automake/local.mk diff --git a/lib/am/Makefile.inc b/lib/am/local.mk similarity index 100% rename from lib/am/Makefile.inc rename to lib/am/local.mk diff --git a/lib/Makefile.inc b/lib/local.mk similarity index 100% rename from lib/Makefile.inc rename to lib/local.mk diff --git a/m4/Makefile.inc b/m4/local.mk similarity index 100% rename from m4/Makefile.inc rename to m4/local.mk diff --git a/t/Makefile.inc b/t/local.mk similarity index 99% rename from t/Makefile.inc rename to 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) -- 2.47.2