From 22a3e2c47bd5c8aa423d4f5b116775c5952b89ab Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Sun, 16 Jul 2023 23:17:49 +0200
Subject: Makefile: Simplify

Suggested-by: Dmitry Goncharov <dgoncharov@users.sf.net>
Suggested-by: Torbjorn SVENSSON <torbjorn.svensson@foss.st.com>
Cc: Philip Guenther <guenther@gmail.com>
Cc: Bruno Haible <bruno@clisp.org>
Cc: Paul Smith <psmith@gnu.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 Makefile         | 28 ++++++++--------------------
 share/mk/make.mk | 23 -----------------------
 2 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 share/mk/make.mk

diff --git a/Makefile b/Makefile
index 112475b87..df7fe6172 100644
--- a/Makefile
+++ b/Makefile
@@ -132,26 +132,14 @@ help:
 .SECONDEXPANSION:
 
 
-include $(MAKEFILEDIR)/check/_.mk
-include $(MAKEFILEDIR)/check/catman.mk
-include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/catman.mk
-include $(MAKEFILEDIR)/build/html.mk
-include $(MAKEFILEDIR)/build/pdf.mk
-include $(MAKEFILEDIR)/build/pre.mk
-include $(MAKEFILEDIR)/build/ps.mk
-include $(MAKEFILEDIR)/build/src.mk
-include $(MAKEFILEDIR)/dist.mk
-include $(MAKEFILEDIR)/install/_.mk
-include $(MAKEFILEDIR)/install/html.mk
-include $(MAKEFILEDIR)/install/man.mk
-include $(MAKEFILEDIR)/lint/_.mk
-include $(MAKEFILEDIR)/lint/c.mk
-include $(MAKEFILEDIR)/lint/man/_.mk
-include $(MAKEFILEDIR)/lint/man/man.mk
-include $(MAKEFILEDIR)/lint/man/mdoc.mk
-include $(MAKEFILEDIR)/make.mk
-include $(MAKEFILEDIR)/verbose.mk
+MK := \
+	$(srcdir)/Makefile \
+	$(wildcard \
+		$(MAKEFILEDIR)/*.mk \
+		$(MAKEFILEDIR)/*/*.mk \
+		$(MAKEFILEDIR)/*/*/*.mk)
+include $(MK)
+$(MK):: ;
 
 
 .PHONY: help-variables
diff --git a/share/mk/make.mk b/share/mk/make.mk
deleted file mode 100644
index 7bbdc166f..000000000
--- a/share/mk/make.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-########################################################################
-# Copyright 2023, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
-
-
-ifndef MAKEFILE_MAKE_INCLUDED
-MAKEFILE_MAKE_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/cmd.mk
-
-
-MK := $(srcdir)/Makefile
-MK += $(shell $(FIND) $(MAKEFILEDIR) -type f \
-	| $(GREP) '\.mk$$' \
-	| $(SORT))
-
-
-$(MK):: ;
-
-
-endif  # include guard
-- 
cgit v1.2.3