Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. d09f6b5dab19b6fc851b884dbcf8e637529d0a90
|
From: n0nb <n0...@us...> - 2025-09-27 18:29:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via d09f6b5dab19b6fc851b884dbcf8e637529d0a90 (commit)
via 0d122f6b1a56a5ed9424dd11ac335cd37093f78f (commit)
via 34fa8d0e2fc9eeb21e1d4f86df65dfc7c1c135e4 (commit)
via 744fe5a066e3656907ea7f59d08e9ec4545cc993 (commit)
from dbea10e65524a41e73017f64ceb88f6b3e6bd59a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d09f6b5dab19b6fc851b884dbcf8e637529d0a90
Merge: dbea10e65 0d122f6b1
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 27 13:23:11 2025 -0500
Merge GitHub PR #1926
commit 0d122f6b1a56a5ed9424dd11ac335cd37093f78f
Author: Nate Bargmann <n0...@n0...>
Date: Sat Sep 27 11:16:32 2025 -0500
Restore information message from diff
Make sure tab preceeds all indented lines.
diff --git a/src/Makefile.am b/src/Makefile.am
index be81f2588..766fd95b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,12 @@ DISTCLEANFILES = hamlibdatetime.h
RIGSRC = hamlibdatetime.h rig.c serial.c serial.h misc.c misc.h register.c register.h event.c \
event.h cal.c cal.h conf.c tones.c tones.h rotator.c locator.c rot_reg.c \
rot_conf.c rot_conf.h rot_settings.c rot_ext.c iofunc.c iofunc.h ext.c \
- mem.c settings.c parallel.c parallel.h usb_port.c usb_port.h debug.c \
- network.c network.h cm108.c cm108.h gpio.c gpio.h idx_builtin.h token.h \
- par_nt.h microham.c microham.h amplifier.c amp_reg.c amp_conf.c \
- amp_conf.h amp_settings.c extamp.c sleep.c sleep.h sprintflst.c \
- sprintflst.h cache.c cache.h snapshot_data.c snapshot_data.h fifo.c fifo.h \
- serial_cfg_params.h mutex.h
+ mem.c settings.c parallel.c parallel.h usb_port.c usb_port.h debug.c \
+ network.c network.h cm108.c cm108.h gpio.c gpio.h idx_builtin.h token.h \
+ par_nt.h microham.c microham.h amplifier.c amp_reg.c amp_conf.c \
+ amp_conf.h amp_settings.c extamp.c sleep.c sleep.h sprintflst.c \
+ sprintflst.h cache.c cache.h snapshot_data.c snapshot_data.h fifo.c fifo.h \
+ serial_cfg_params.h mutex.h
if VERSIONDLL
RIGSRC += \
@@ -43,7 +43,7 @@ hamlibdatetime.h: FORCE
${AM_V_at}if test -x $(top_srcdir)/.git ; then \
echo "/* This date time is from the last non-merge commit to Hamlib. */" > $(builddir)/$(@F).tmp ;\
echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%Y-%m-%dT%H:%M:%SZ SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 --format='%h')\" >> $(builddir)/$(@F).tmp ;\
- if ! diff -qN $(builddir)/$(@F).tmp $(builddir)/$(@F)> /dev/null ; then { echo "Generating SCS header \"$(builddir)/$(@F)\"" ; mv -f $(builddir)/$(@F).tmp $(builddir)/$(@F) ; } fi ;\
+ if ! diff -qN $(builddir)/$(@F).tmp $(builddir)/$(@F) ; then { echo "Generating SCS header \"$(builddir)/$(@F)\"" ; mv -f $(builddir)/$(@F).tmp $(builddir)/$(@F) ; } fi ;\
rm -f $(builddir)/$(@F).tmp ;\
touch -c $(top_srcdir)/src/version_dll.rc ;\
else \
commit 34fa8d0e2fc9eeb21e1d4f86df65dfc7c1c135e4
Author: Nate Bargmann <n0...@n0...>
Date: Fri Sep 26 18:02:02 2025 -0500
Refactor hamlibdatetime.h target
Re: GitHub Issue #1895
Thanks to inspiration from Jan Engelhardt <ej...@in...> via the GNU
automake mailing list on Thu, 25 Sep 2025 20:40:21 +0200 (CEST):
https://lists.gnu.org/archive/html/automake/2025-09/msg00013.html
The 'diff' command has been wrapped inside an 'if' conditional to
hopefully hide its return value from FreeBSD make.
Also make a couple other small changes.
diff --git a/src/Makefile.am b/src/Makefile.am
index 122212c87..be81f2588 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,10 +40,10 @@ $(libhamlib_la_DEPENDENCIES):
# directory before the source directory for the hamlibdatetime.h
# header.
hamlibdatetime.h: FORCE
- @if test -x $(top_srcdir)/.git ; then \
+ ${AM_V_at}if test -x $(top_srcdir)/.git ; then \
echo "/* This date time is from the last non-merge commit to Hamlib. */" > $(builddir)/$(@F).tmp ;\
- echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%Y-%m-%dT%H:%M:%SZ SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 | head -n 1 | cut -c8-13)\" >> $(builddir)/$(@F).tmp ;\
- diff -qN $(builddir)/$(@F).tmp $(builddir)/$(@F) ; test $$? -eq 0 || { echo "Generating SCS header \"$(builddir)/$(@F)\"" ; mv -f $(builddir)/$(@F).tmp $(builddir)/$(@F) ; } ;\
+ echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges --date='format-local:%Y-%m-%dT%H:%M:%SZ SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 --format='%h')\" >> $(builddir)/$(@F).tmp ;\
+ if ! diff -qN $(builddir)/$(@F).tmp $(builddir)/$(@F)> /dev/null ; then { echo "Generating SCS header \"$(builddir)/$(@F)\"" ; mv -f $(builddir)/$(@F).tmp $(builddir)/$(@F) ; } fi ;\
rm -f $(builddir)/$(@F).tmp ;\
touch -c $(top_srcdir)/src/version_dll.rc ;\
else \
commit 744fe5a066e3656907ea7f59d08e9ec4545cc993
Author: Jan Engelhardt <ej...@in...>
Date: Wed Sep 24 20:47:46 2025 +0200
Remove redundant path from BUILT_SOURCES
Re: GitHub Issue #1895
In response to a query to the automake mailing list, this reply was
received:
On Wednesday 2025-09-24 19:05, Nate Bargmann wrote:
>make[1]: don't know how to make ./hamlibdatetime.h. Stop
Something wanted to make "./hamlibdatetime.h", but you only provide
a rule for "hamlibdatetime.h":
>hamlibdatetime.h: FORCE
> @if test -x $(top_srcdir)/.git ; then \
> echo "/* This date time is from the last non-merge commit to Hamlib. */" > $(builddir)/$(@F).tmp ;\
> echo "#define HAMLIBDATETIME "\"$$(TZ=UTC git --git-dir=$(top_srcdir)/.git log --no-merges
+--date='format-local:%Y-%m-%dT%H:%M:%SZ SHA=' --format='%cd' -n 1)$$(git --git-dir=$(top_srcdir)/.git log --no-merges -n 1 | head
+-n 1 | cut -c8-13)\" >> $(builddir)/$(@F).tmp ;\
The distinction is important.
>BUILT_SOURCES = $(builddir)/hamlibdatetime.h
All targets are already relative to ${builddir},
so explicitly mentioning ${builddir} is wrong for
targets, and redundant in the recipe.
----------------------
Removing "$(builddir)/" allows FreeBSD make to enter the rule. GNU make
wasn't bothered by the prepending of the path when comparing to the
Makefile target.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8714ba81e..122212c87 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
AM_CFLAGS += $(LIBUSB_CFLAGS)
-BUILT_SOURCES = $(builddir)/hamlibdatetime.h
+BUILT_SOURCES = hamlibdatetime.h
DISTCLEANFILES = hamlibdatetime.h
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
