From 4bca8fc8f547c6087601dc83711ee499f2a5d01e Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Wed, 17 Nov 2021 04:05:40 +0500
Subject: [PATCH] Remove unnecessary makefiles

---
 .gitignore                                    |  7 ++-----
 Makefile                                      | 21 +++++--------------
 config/{4-defvars-bsd.mk => 2-defvars-bsd.mk} |  0
 config/{4-defvars-gnu.mk => 2-defvars-gnu.mk} |  0
 configure                                     | 10 +++------
 5 files changed, 10 insertions(+), 28 deletions(-)
 rename config/{4-defvars-bsd.mk => 2-defvars-bsd.mk} (100%)
 rename config/{4-defvars-gnu.mk => 2-defvars-gnu.mk} (100%)

diff --git a/.gitignore b/.gitignore
index 9b02266..dfa9fc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-/config/1-custom.mk
-/config/2-generated.mk
-/config/3-custom.mk
-/config/4-defvars.mk
-/config/5-custom.mk
+/config/1-generated.mk
+/config/2-defvars.mk
 /polytreewm
 /src/*.o
diff --git a/Makefile b/Makefile
index 3f7bf36..3aa9fe1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,18 +3,12 @@
 
 all: polytreewm
 
-include config/1-custom.mk
-include config/2-generated.mk
-include config/3-custom.mk
-include config/4-defvars.mk
-include config/5-custom.mk
+include config/1-generated.mk
+include config/2-defvars.mk
 
 CONFIGMKS = \
-	config/1-custom.mk \
-	config/2-generated.mk \
-	config/3-custom.mk \
-	config/4-defvars.mk \
-	config/5-custom.mk
+	config/1-generated.mk \
+	config/2-defvars.mk \
 
 VERSION = 6.2
 
@@ -64,12 +58,7 @@ clean:
 	rm -f polytreewm ${OBJ}
 
 distclean: clean
-	rm -f \
-		config/1-custom.mk \
-		config/2-generated.mk \
-		config/3-custom.mk \
-		config/4-defvars.mk \
-		config/5-custom.mk
+	rm -f $(CONFIGMKS)
 
 install: all
 	mkdir -p ${DESTDIR}${BINDIR}
diff --git a/config/4-defvars-bsd.mk b/config/2-defvars-bsd.mk
similarity index 100%
rename from config/4-defvars-bsd.mk
rename to config/2-defvars-bsd.mk
diff --git a/config/4-defvars-gnu.mk b/config/2-defvars-gnu.mk
similarity index 100%
rename from config/4-defvars-gnu.mk
rename to config/2-defvars-gnu.mk
diff --git a/configure b/configure
index 4d60fae..cf72255 100755
--- a/configure
+++ b/configure
@@ -110,11 +110,7 @@ echo "MANDIR                = $mandir"
 echo "ENABLE_GNOME_TERMINAL = $enable_gnome_terminal"
 echo "ENABLE_XINERAMA       = $enable_xinerama"
 
-touch 'config/1-custom.mk'
-touch 'config/3-custom.mk'
-touch 'config/5-custom.mk'
-
-cat > 'config/2-generated.mk' << MAKE
+cat > 'config/1-generated.mk' << MAKE
 PREFIX                = $prefix
 EPREFIX               = $eprefix
 BINDIR                = $bindir
@@ -126,7 +122,7 @@ MAKE
 
 make_help_result="$(make --help 2>&1 || true)"
 if [ "$(echo "$make_help_result" | grep 'gnu.org')" = '' ]; then
-	ln -sf '4-defvars-bsd.mk' 'config/4-defvars.mk'
+	ln -sf '2-defvars-bsd.mk' 'config/2-defvars.mk'
 else
-	ln -sf '4-defvars-gnu.mk' 'config/4-defvars.mk'
+	ln -sf '2-defvars-gnu.mk' 'config/2-defvars.mk'
 fi