From d065bcb8ef0311ab21f85c8a7d1aec83db2c6cb1 Mon Sep 17 00:00:00 2001
From: Daniele Forsi IU5HKX <iu5hkx@gmail.com>
Date: Thu, 3 Jul 2025 23:06:02 +0200
Subject: [PATCH] Sort SUBDIRS and DIST_SUBDIRS and fix them

"security" was added twice to SUBDIRS and BACKEND_LIST is not set
by configure.
---
 Makefile.am | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f191a4f69..816478151 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,28 @@ EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.md README.developer \
 doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \
 	README.md README.betatester README.developer
 
-SUBDIRS = macros include lib security \
-	$(BACKEND_LIST) \
+SUBDIRS = \
+	$(AMP_BACKEND_LIST) \
+	$(BINDINGS) \
 	$(RIG_BACKEND_LIST) \
 	$(ROT_BACKEND_LIST) \
-	$(AMP_BACKEND_LIST) \
-    security \
+	doc \
+	include \
+	lib \
+	macros \
+	security \
 	src \
-	$(BINDINGS) \
-	tests doc
+	tests
 
 ## Static list of distributed directories.
-DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rotators/indi simulators\
-	security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
+DIST_SUBDIRS = \
+	$(SUBDIRS) \
+	android \
+	bindings \
+	c++ \
+	rotators/indi \
+	scripts \
+	simulators
 
 # Install any third party macros into our tree for distribution
 ACLOCAL_AMFLAGS = -I macros --install