From d065bcb8ef0311ab21f85c8a7d1aec83db2c6cb1 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Thu, 3 Jul 2025 23:06:02 +0200 Subject: [PATCH 01/21] 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 From f4cebd5339ce813ab2eba541bc5eca835db240c1 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Thu, 3 Jul 2025 23:19:26 +0200 Subject: [PATCH 02/21] Do not compile rigs/winradio if disabled in configure To disable: ./configure --disable-winradio --- Makefile.am | 1 + configure.ac | 17 ++++++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 816478151..3b8f332c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ SUBDIRS = \ ## Static list of distributed directories. DIST_SUBDIRS = \ + $(RIG_BACKEND_OPTIONAL_LIST) \ $(SUBDIRS) \ android \ bindings \ diff --git a/configure.ac b/configure.ac index c1cbf9749..1eee8c083 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,8 @@ dnl added to AC_CONFIG_FILES near the end of this file. See README.developer dnl Beware of duplication should a backend directory include both rig and dnl rotor definitions, e.g. "dummy". Optional backends will not be listed dnl here but will be added later, e.g. "winradio". -RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola rigs/commradio rigs/guohetec" +RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola rigs/commradio rigs/guohetec" +RIG_BACKEND_OPTIONAL_LIST="" ROT_BACKEND_LIST="rotators/amsat rotators/apex rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/flir rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/saebrtrack rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/skywatcher rotators/radant" # Amplifiers are all in the amplifiers directory AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini amplifiers/expert" @@ -778,19 +779,12 @@ AC_MSG_RESULT([$cf_with_parallel]) DL_LIBS="" AS_IF([test x"${cf_with_winradio}" = "xyes"], - [RIGS_BACKEND_LIST="$RIGS_BACKEND_LIST rigs/winradio" + [RIG_BACKEND_LIST="$RIG_BACKEND_LIST rigs/winradio" dnl Check for libdl and set DL_LIBS if found--used for linradio WR-G313 backend. AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [AC_MSG_WARN([dlopen was not found in libdl--linradio backend will be disabled])]) - ]) - -# Still need -ldl if we have it -AS_IF([test x"${cf_with_winradio}" = "xno"], - [RIGS_BACKEND_LIST="$RIGS_BACKEND_LIST" -dnl Check for libdl and set DL_LIBS if found--used for linradio WR-G313 backend. - AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], - [AC_MSG_WARN([dlopen was not found in libdl--linradio backend will be disabled])]) - ]) + ], + [RIG_BACKEND_OPTIONAL_LIST="$RIG_BACKEND_OPTIONAL_LIST rigs/winradio"]) dnl Set conditional compilation for G-313. AS_CASE(["$host_os"], @@ -850,6 +844,7 @@ for be in ${RIG_BACKEND_LIST} ; do RIG_BACKENDEPS="${RIG_BACKENDEPS} \$(top_builddir)/rigs/${RIGDIR}/libhamlib-${RIGDIR}.la" done +AC_SUBST([RIG_BACKEND_OPTIONAL_LIST]) AC_SUBST([RIG_BACKEND_LIST]) AC_SUBST([RIG_BACKENDEPS]) From e7daf11d5cdd05d6299fedbc8d18b40b6bfacf48 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Thu, 3 Jul 2025 23:39:50 +0200 Subject: [PATCH 03/21] Do not compile rotators/indi if disabled in configure To disable: ./configure --without-indi --- Makefile.am | 2 +- configure.ac | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b8f332c0..24601fdec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,11 +29,11 @@ SUBDIRS = \ ## Static list of distributed directories. DIST_SUBDIRS = \ $(RIG_BACKEND_OPTIONAL_LIST) \ + $(ROT_BACKEND_OPTIONAL_LIST) \ $(SUBDIRS) \ android \ bindings \ c++ \ - rotators/indi \ scripts \ simulators diff --git a/configure.ac b/configure.ac index 1eee8c083..2d178e8ba 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,7 @@ dnl here but will be added later, e.g. "winradio". RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola rigs/commradio rigs/guohetec" RIG_BACKEND_OPTIONAL_LIST="" ROT_BACKEND_LIST="rotators/amsat rotators/apex rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/flir rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/saebrtrack rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/skywatcher rotators/radant" +ROT_BACKEND_OPTIONAL_LIST="" # Amplifiers are all in the amplifiers directory AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini amplifiers/expert" @@ -435,11 +436,12 @@ AS_IF([test x"$cf_with_indi_support" != "xno"], [ cf_with_indi_support=no ]) - AS_IF([test x"$cf_with_indi_support" != "xno"], [ - ROT_BACKEND_LIST="$ROT_BACKEND_LIST rotators/indi" - ]) ]) ]) +AS_IF([test x"$cf_with_indi_support" != "xno"], + [ROT_BACKEND_LIST="$ROT_BACKEND_LIST rotators/indi"], + [ROT_BACKEND_OPTIONAL_LIST="$ROT_BACKEND_OPTIONAL_LIST rotators/indi"] +) dnl Check if libgd-dev is installed, so we can enable rigmatrix AC_MSG_CHECKING([whether to build HTML rig feature matrix]) @@ -860,6 +862,7 @@ for be in ${ROT_BACKEND_LIST} ; do ROT_BACKENDEPS="${ROT_BACKENDEPS} \$(top_builddir)/rotators/${ROTDIR}/libhamlib-${ROTDIR}.la" done +AC_SUBST([ROT_BACKEND_OPTIONAL_LIST]) AC_SUBST([ROT_BACKEND_LIST]) AC_SUBST([ROT_BACKENDEPS]) From 55805c90c91dbcab9270bf73616c9d9cd19afd23 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 09:55:03 +0200 Subject: [PATCH 04/21] Do the configure step with everything "no", then with "yes" Shared and static libraries are built in both cases. The usrp driver is "no" in both cases because it's in an external repository. --- .github/workflows/c-cpp.yml | 39 +++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 3988d64e0..6e4c021c7 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -12,6 +12,41 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] + configure_args: + - > + --enable-html-matrix=no + --enable-parallel=no + --enable-pytest=no + --enable-shared=yes + --enable-static=yes + --enable-usrp=no + --enable-winradio=no + --with-cxx-binding=no + --with-indi=no + --with-libusb=no + --with-lua-binding=no + --with-perl-binding=no + --with-python-binding=no + --with-readline=no + --with-tcl-binding=no + --with-xml-support=no + - > + --enable-html-matrix=yes + --enable-parallel=yes + --enable-pytest=yes + --enable-shared=yes + --enable-static=yes + --enable-usrp=no + --enable-winradio=yes + --with-cxx-binding=yes + --with-indi=yes + --with-libusb=yes + --with-lua-binding=yes + --with-perl-binding=yes + --with-python-binding=yes + --with-readline=yes + --with-tcl-binding=yes + --with-xml-support=yes steps: - uses: actions/checkout@v4 @@ -41,10 +76,10 @@ jobs: run: grep README Makefile.am - name: configure if: runner.os != 'macOS' - run: ./configure --with-lua-binding --with-perl-binding --with-python-binding --with-tcl-binding + run: ./configure ${{ matrix.configure_args }} - name: configure on macOS if: runner.os == 'macOS' - run: ./configure --without-python-binding + run: ./configure ${{ matrix.configure_args }} --without-python-binding - name: make run: make -j 4 - name: make check From bdde43f175692144e436e3d3bf1b23fd4c648925 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 09:57:46 +0200 Subject: [PATCH 05/21] Execute make with less verbosity for better readability This replaces the lines "Entering directory {DIRECTORY}" / "Leaving directory {DIRECTORY}" with just "Making {TARGET} {DIRECTORY}" and hides other output. Warning and errors are shown anyway. --- .github/workflows/c-cpp.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6e4c021c7..7ae182bca 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -76,14 +76,12 @@ jobs: run: grep README Makefile.am - name: configure if: runner.os != 'macOS' - run: ./configure ${{ matrix.configure_args }} + run: ./configure ${{ matrix.configure_args }} --enable-silent-rules - name: configure on macOS if: runner.os == 'macOS' - run: ./configure ${{ matrix.configure_args }} --without-python-binding + run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding - name: make - run: make -j 4 - - name: make check - run: make check + run: make -j 4 V=0 --no-print-directory - name: make distcheck - run: make distcheck + run: make distcheck V=0 --no-print-directory From 6a9f93a89e166fc3b293f18ba440986be40e6f43 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 10:37:30 +0200 Subject: [PATCH 06/21] Remove trailing newline from YAML multiline strings --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7ae182bca..fba3329ea 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] configure_args: - - > + - >- --enable-html-matrix=no --enable-parallel=no --enable-pytest=no @@ -30,7 +30,7 @@ jobs: --with-readline=no --with-tcl-binding=no --with-xml-support=no - - > + - >- --enable-html-matrix=yes --enable-parallel=yes --enable-pytest=yes From 6433447e913eb865e655ab30a144363fcd04bbf7 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 11:45:02 +0200 Subject: [PATCH 07/21] Install TCL for macOS in the CI --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index fba3329ea..6c1f89991 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -65,6 +65,7 @@ jobs: brew install automake brew install libtool brew install grep + brew install tcl-tk - name: bootstrap run: ./bootstrap - name: Suppress -Winitializer-overrides on macOS From 419cb02dd5998c937fb6df3bd180b3d6c3dce00c Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 11:51:49 +0200 Subject: [PATCH 08/21] Install Lua for macOS in the CI Install the latest version available. --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6c1f89991..dd4ab5709 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -65,6 +65,7 @@ jobs: brew install automake brew install libtool brew install grep + brew install lua brew install tcl-tk - name: bootstrap run: ./bootstrap From 585d23ae5b25844c49e492eda21338d56ed5141b Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 12:39:38 +0200 Subject: [PATCH 09/21] Temporarily disable building Lua bindings on macOS --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index dd4ab5709..562f4bfc9 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -81,7 +81,7 @@ jobs: run: ./configure ${{ matrix.configure_args }} --enable-silent-rules - name: configure on macOS if: runner.os == 'macOS' - run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding + run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding --without-lua-binding - name: make run: make -j 4 V=0 --no-print-directory - name: make distcheck From b73d4a5cefda6f35331d39295e5c0263f7aa3576 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 12:42:42 +0200 Subject: [PATCH 10/21] Install SWIG for macOS in the CI Install the latest version available. --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 562f4bfc9..46ecaff38 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -66,6 +66,7 @@ jobs: brew install libtool brew install grep brew install lua + brew install swig brew install tcl-tk - name: bootstrap run: ./bootstrap From f68c48aac54210e2bd1ee7ee2fd15401e8a201d2 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 13:04:49 +0200 Subject: [PATCH 11/21] Add dependency to hamlibdatetime.h Fixes a race during parallel builds: rig.c:74:10: fatal error: 'hamlibdatetime.h' file not found Occurred in https://github.com/Hamlib/Hamlib/actions/runs/16087329208/job/45400068817 --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 0e940b317..a1a92ba23 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,6 +49,8 @@ hamlibdatetime.h: FORCE test -f $(srcdir)/$(@F) || cp $(srcdir)/$(@F).in $(srcdir)/$(@F) ;\ fi +snapshot_data.o rig.o: hamlibdatetime.h + RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE) From e5e4ef84fe0b6811ac8bd6bc5307aa36c8a0c512 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 16:49:29 +0200 Subject: [PATCH 12/21] Remove redundant rule for make clean All built files are deleted automatically. --- simulators/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/simulators/Makefile.am b/simulators/Makefile.am index a9a799e79..5913dbd2b 100644 --- a/simulators/Makefile.am +++ b/simulators/Makefile.am @@ -46,5 +46,3 @@ EXTRA_DIST = $(top_builddir)/src/libhamlib.la: $(MAKE) -C $(top_builddir)/src/ libhamlib.la - -CLEANFILES = simelelecraft simicgeneric simkenwood simyaesu From b96afa9372433735235895b4a2dddbedc2f54a74 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 16:58:52 +0200 Subject: [PATCH 13/21] Remove redundant rule for make make knows how to build an excutable from a single source file. --- simulators/Makefile.am | 5 ----- 1 file changed, 5 deletions(-) diff --git a/simulators/Makefile.am b/simulators/Makefile.am index 5913dbd2b..2c7cb7f04 100644 --- a/simulators/Makefile.am +++ b/simulators/Makefile.am @@ -10,11 +10,6 @@ bin_PROGRAMS = check_PROGRAMS = simelecraft simicgeneric simkenwood simyaesu simic9100 simic9700 simft991 simftdx1200 simftdx3000 simjupiter simpowersdr simid5100 simft736 simftdx5000 simtmd700 simrotorez simspid simft817 simts590 simft847 simic7300 simic7000 simic7100 simic7200 simatd578 simic905 simts450 simic7600 simic7610 simic705 simts950 simts990 simic7851 simftdx101 simxiegug90 simqrplabs simft818 simic275 simtrusdx simft1000 simtmd710 simts890 simxiegux108g simxiegux6100 simic910 simft450 simelecraftk4 simmicom simflex simft710 simic2730 simorion simpmr171 simic7700 simft990 simpstrotator simeasycomm simicr8600 -simelecraft_SOURCES = simelecraft.c -simkenwood_SOURCES = simkenwood.c -simyaesu_SOURCES = simyaesu.c -simid5100_SOURCES = simid5100.c - # include generated include files ahead of any in sources #rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS) From 3706f365a545aa67ec4147cf9aa146ec40ace871 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 18:31:54 +0200 Subject: [PATCH 14/21] Temporarily disable parallel builds --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 46ecaff38..2ca09632e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -84,7 +84,7 @@ jobs: if: runner.os == 'macOS' run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding --without-lua-binding - name: make - run: make -j 4 V=0 --no-print-directory + run: make V=0 --no-print-directory - name: make distcheck run: make distcheck V=0 --no-print-directory From 98489501fe80c32cf456c4bf962f628a4dc175ca Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 19:44:54 +0200 Subject: [PATCH 15/21] 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 From 2fc0b8eef5e85cccf00c449c95a5405a78617038 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 20:23:45 +0200 Subject: [PATCH 16/21] Fix make distcheck again --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5fd285816..de615d314 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ SUBDIRS = macros include lib security \ DIST_SUBDIRS = \ $(RIG_BACKEND_OPTIONAL_LIST) \ $(ROT_BACKEND_OPTIONAL_LIST) \ - macros include lib src c++ bindings tests doc android scripts rotators/indi simulators\ + macros include lib src c++ bindings tests doc android scripts simulators\ security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST) # Install any third party macros into our tree for distribution From 633cee04d2b78053c470c5d78ca92d2722ea4fbe Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 21:40:13 +0200 Subject: [PATCH 17/21] Install INDI development packages for Linux in the CI --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2ca09632e..e50897563 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -55,6 +55,7 @@ jobs: run: | sudo apt install libusb-1.0-0-dev sudo apt install libgpiod-dev + sudo apt install libindi-dev libnova-dev sudo apt install grep sudo apt install python3-dev python3-pytest sudo apt install lua5.4 liblua5.4-dev libperl-dev tcl-dev From 8c94897208b2197c3fd2ec3eef138f66306065d4 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 22:09:18 +0200 Subject: [PATCH 18/21] Install development package for rigmatrix for Linux in the CI --- .github/workflows/c-cpp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e50897563..33780993e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -54,6 +54,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt install libusb-1.0-0-dev + sudo apt install libgd-dev sudo apt install libgpiod-dev sudo apt install libindi-dev libnova-dev sudo apt install grep From 54c2eb89a2fe75103c942596a6f81dbb71b4a0fc Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sat, 5 Jul 2025 22:19:46 +0200 Subject: [PATCH 19/21] Revert "Temporarily disable parallel builds" This reverts commit 3706f365a545aa67ec4147cf9aa146ec40ace871. --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 33780993e..169863e35 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -86,7 +86,7 @@ jobs: if: runner.os == 'macOS' run: ./configure ${{ matrix.configure_args }} --enable-silent-rules --without-python-binding --without-lua-binding - name: make - run: make V=0 --no-print-directory + run: make -j 4 V=0 --no-print-directory - name: make distcheck run: make distcheck V=0 --no-print-directory From 976bfb42767019de50c8d29aebdbfdb933a88b01 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sun, 6 Jul 2025 19:42:10 +0200 Subject: [PATCH 20/21] Remove the executable bit from data files --- doc/manuals/OTRSP_Protocol.pdf | Bin rigs/yaesu/FT-817CAT.pdf | Bin rigs/yaesu/FT-817MemoryMap.pdf | Bin rotators/grbltrk/Makefile.am | 0 security/AESStringCrypt.h | 0 security/Makefile.nt | 0 security/aes.h | 0 security/password.h | 0 security/sha256.h | 0 src/Makefile.am | 0 src/version_dll.rc | 0 11 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 doc/manuals/OTRSP_Protocol.pdf mode change 100755 => 100644 rigs/yaesu/FT-817CAT.pdf mode change 100755 => 100644 rigs/yaesu/FT-817MemoryMap.pdf mode change 100755 => 100644 rotators/grbltrk/Makefile.am mode change 100755 => 100644 security/AESStringCrypt.h mode change 100755 => 100644 security/Makefile.nt mode change 100755 => 100644 security/aes.h mode change 100755 => 100644 security/password.h mode change 100755 => 100644 security/sha256.h mode change 100755 => 100644 src/Makefile.am mode change 100755 => 100644 src/version_dll.rc diff --git a/doc/manuals/OTRSP_Protocol.pdf b/doc/manuals/OTRSP_Protocol.pdf old mode 100755 new mode 100644 diff --git a/rigs/yaesu/FT-817CAT.pdf b/rigs/yaesu/FT-817CAT.pdf old mode 100755 new mode 100644 diff --git a/rigs/yaesu/FT-817MemoryMap.pdf b/rigs/yaesu/FT-817MemoryMap.pdf old mode 100755 new mode 100644 diff --git a/rotators/grbltrk/Makefile.am b/rotators/grbltrk/Makefile.am old mode 100755 new mode 100644 diff --git a/security/AESStringCrypt.h b/security/AESStringCrypt.h old mode 100755 new mode 100644 diff --git a/security/Makefile.nt b/security/Makefile.nt old mode 100755 new mode 100644 diff --git a/security/aes.h b/security/aes.h old mode 100755 new mode 100644 diff --git a/security/password.h b/security/password.h old mode 100755 new mode 100644 diff --git a/security/sha256.h b/security/sha256.h old mode 100755 new mode 100644 diff --git a/src/Makefile.am b/src/Makefile.am old mode 100755 new mode 100644 diff --git a/src/version_dll.rc b/src/version_dll.rc old mode 100755 new mode 100644 From 84799e2f6c3da704a0877465b77cd3d9bc1dfe15 Mon Sep 17 00:00:00 2001 From: Daniele Forsi IU5HKX Date: Sun, 6 Jul 2025 19:44:43 +0200 Subject: [PATCH 21/21] Revert "Install Lua for macOS in the CI" This reverts commit 419cb02dd5998c937fb6df3bd180b3d6c3dce00c. Conflicts: .github/workflows/c-cpp.yml --- .github/workflows/c-cpp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 169863e35..db7bdb037 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -67,7 +67,6 @@ jobs: brew install automake brew install libtool brew install grep - brew install lua brew install swig brew install tcl-tk - name: bootstrap