From 98489501fe80c32cf456c4bf962f628a4dc175ca Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 19:44:54 +0200 Subject: [PATCH] Revert "Sort SUBDIRS and DIST_SUBDIRS and fix them" This reverts commit d065bcb8ef0311ab21f85c8a7d1aec83db2c6cb1. Conflicts: Makefile.am --- Makefile.am | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 24601fdec..5fd285816 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,29 +13,22 @@ 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 = \ - $(AMP_BACKEND_LIST) \ - $(BINDINGS) \ +SUBDIRS = macros include lib security \ + $(BACKEND_LIST) \ $(RIG_BACKEND_LIST) \ $(ROT_BACKEND_LIST) \ - doc \ - include \ - lib \ - macros \ - security \ + $(AMP_BACKEND_LIST) \ + security \ src \ - tests + $(BINDINGS) \ + tests doc ## Static list of distributed directories. DIST_SUBDIRS = \ $(RIG_BACKEND_OPTIONAL_LIST) \ $(ROT_BACKEND_OPTIONAL_LIST) \ - $(SUBDIRS) \ - android \ - bindings \ - c++ \ - scripts \ - simulators + 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) # Install any third party macros into our tree for distribution ACLOCAL_AMFLAGS = -I macros --install