Skip to content

Commit 7a50d36

Browse files
authored
Merge 5d1ae31 into ee388a7
2 parents ee388a7 + 5d1ae31 commit 7a50d36

File tree

32 files changed

+314
-204
lines changed

32 files changed

+314
-204
lines changed

Makefile.am

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

NEWS.adoc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,14 @@ several `FSD` notifications into one executed action. [PR #3097]
431431
* Fixed CI recipes for PyPI publication of PyNUT(Client) module to also
432432
include the source distribution (was posted for NUT v2.8.1 and v2.8.2
433433
tagged releases, but absent for v2.8.3 and v2.8.4). [#3056]
434+
* A new version of BSD `make` in NetBSD 11 (Beta) aka `bmake` in some other
435+
operating systems, complains about some of our sub-`$(MAKE)` calls despite
436+
the explicit `+` prefix in corresponding lines, possibly because that call
437+
happens not directly in a rule definition, but in a substituted shell code
438+
snippet. The recommended workaround was to add a "Special Source" called
439+
`.MAKE` to let the tool know that we expect sub-makes in that recipe.
440+
However, *other* `make` implementations do not know about this token,
441+
so its support is tried and detected at `configure` time. [PR #3300]
434442
* Updated `make spellcheck` to help avoid asciidoc admonition blocks with
435443
visually invalid sentences (after rendering as a box in HTML or PDF).
436444
[#3077]

clients/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $(top_builddir)/common/libcommon.la \
2323
$(top_builddir)/common/libcommonclient.la \
2424
$(top_builddir)/common/libcommonversion.la \
2525
$(top_builddir)/common/libcommonstrjson.la \
26-
$(top_builddir)/common/libparseconf.la: dummy
26+
$(top_builddir)/common/libparseconf.la: dummy @dotMAKE@
2727
+@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
2828

2929
# Builds from root dir arrange stuff decently. Make sure parallel builds
@@ -39,7 +39,7 @@ LDADD_CLIENT =
3939
if ENABLE_SHARED_PRIVATE_LIBS
4040
$(top_builddir)/common/libcommonversion-private.la \
4141
$(top_builddir)/common/libnutprivate-@NUT_SOURCE_GITREV_SEMVER_UNDERSCORES@-common-all.la \
42-
$(top_builddir)/common/libnutprivate-@NUT_SOURCE_GITREV_SEMVER_UNDERSCORES@-common-client.la: dummy
42+
$(top_builddir)/common/libnutprivate-@NUT_SOURCE_GITREV_SEMVER_UNDERSCORES@-common-client.la: dummy @dotMAKE@
4343
+@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
4444

4545
$(top_builddir)/common/libcommonversion-private.la: $(top_builddir)/include/nut_version.h

common/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ else !BUILDING_IN_TREE
9292
BUILT_SOURCES = common-nut_version.c
9393
endif !BUILDING_IN_TREE
9494

95-
$(top_builddir)/include/nut_version.h:
95+
$(top_builddir)/include/nut_version.h: @dotMAKE@
9696
+@if [ -s '$@' ] && ( [ x"$(NUT_VERSION_H_GENERATED)" = xtrue ] || [ x"$${NUT_VERSION_H_GENERATED}" = xtrue ] ) ; then \
9797
if [ x"$(MAINTAINER_GENERATE_HEADER_DEBUG)" = xyes ] ; then \
9898
echo "=== SKIP (common) $@ (NUT_VERSION_H_GENERATED makevar=$(NUT_VERSION_H_GENERATED) shellvar=$${NUT_VERSION_H_GENERATED})" >&2; \

conf/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ SPELLCHECK_SRC = $(dist_sysconf_DATA) \
3737
# We also have to export some variables that may be tainted by relative
3838
# paths when parsing the other makefile (e.g. MKDIR_P that may be defined
3939
# via expanded $(top_builddir)/install-sh):
40-
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
40+
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT) @dotMAKE@
4141
# +$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
4242

4343
# NOTE: Portable suffix rules do not allow prerequisites, so we shim them here
4444
# by a wildcard target in case the make implementation can put the two together.
4545
*-spellchecked: Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
4646

47-
.sample.sample-spellchecked:
47+
.sample.sample-spellchecked: @dotMAKE@
4848
+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
4949

50-
.in.in-spellchecked:
50+
.in.in-spellchecked: @dotMAKE@
5151
+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
5252

53-
spellcheck spellcheck-interactive spellcheck-sortdict:
53+
spellcheck spellcheck-interactive spellcheck-sortdict: @dotMAKE@
5454
+$(MAKE) -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC="$(SPELLCHECK_SRC)" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
5555

5656

configure.ac

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ NUT_ARG_WITH_EXPAND_DEFAULT_HELP_SINGLEQUOTE([confdir-examples], [DIRPATH], [Com
317317

318318
dnl ---------------------------------------------------------------------
319319
dnl GNU and BSD make are okay with the syntax, but Sun make/dmake are not:
320-
AC_MSG_CHECKING([whether this make implementation supports export VAR=VAL syntax])
320+
AC_MSG_CHECKING([whether this make implementation supports 'export VAR=VAL' syntax])
321321
dnl # using printf formatting for some funniner shells out there
322322
nut_am_output="`printf 'export VAR=VAL\ntest:\n\t@echo \"VAR=%s%sVAR%s\"\n' '\$' '(' ')' | ${MAKE-make} -f - test`"
323323
nut_am_result="$?"
@@ -330,6 +330,24 @@ AS_IF([test x"${nut_am_result}" = x0 -a x"${nut_am_output}" = x"VAR=VAL"], [
330330
])
331331
AC_SUBST(NUT_AM_MAKE_CAN_EXPORT)
332332

333+
dnl ---------------------------------------------------------------------
334+
dnl Some versions of BSD make (e.g. in NetBSD 11) may require this syntax
335+
dnl in lieu of the more standard "+" prefix, but at least GNU make exploded
336+
dnl with it, so we can not use it everywhere:
337+
AC_MSG_CHECKING([whether this make implementation supports a .MAKE special source (pseudo-goal for sub-makes)])
338+
dnl # using printf formatting for some funniner shells out there
339+
nut_am_output="`printf 'sub: .MAKE\n\t@printf \\\"test:\\\\n\\\\t@echo %s\\\\n\\\" | $(MAKE) -f - test\n' '\\\\\\\"Hello world\\\\\\\"' | ${MAKE-make} -f - sub`"
340+
nut_am_result="$?"
341+
AS_IF([test x"${nut_am_result}" = x0 -a x"${nut_am_output}" = x"Hello world"], [
342+
dotMAKE=".MAKE"
343+
AC_MSG_RESULT(yes)
344+
], [
345+
dotMAKE=""
346+
AC_MSG_RESULT(no: got '${nut_am_output}')
347+
])
348+
AC_SUBST(dotMAKE)
349+
350+
dnl ---------------------------------------------------------------------
333351
dnl Some systems have older autotools without direct macro support for PKG_CONF*
334352
NUT_CHECK_PKGCONFIG
335353

@@ -3122,8 +3140,14 @@ if test "${nut_with_gpio}" != "no"; then
31223140
fi
31233141

31243142
dnl NOTE: m4 scriptlet also defines WITH_LIBGPIO_VERSION like 0x00020000 in config.h
3125-
NUT_REPORT_DRIVER([build GPIO driver (library v${GPIO_VERSION})], [${nut_with_gpio}], [${nut_gpio_lib}],
3143+
AS_IF([test x"${GPIO_VERSION}" = xnone], [
3144+
REPORT_GPIO_VERSION="library version not detected"
3145+
],[
3146+
REPORT_GPIO_VERSION="library v${GPIO_VERSION}"
3147+
])
3148+
NUT_REPORT_DRIVER([build GPIO driver (${REPORT_GPIO_VERSION})], [${nut_with_gpio}], [${nut_gpio_lib}],
31263149
[WITH_GPIO], [Define to enable GPIO support])
3150+
unset REPORT_GPIO_VERSION
31273151

31283152
dnl ----------------------------------------------------------------------
31293153
dnl The Mac OS X meta-driver looks at IOKit Power Sources keys managed by
@@ -7204,4 +7228,7 @@ AS_IF([test x"${theMAKE}" = x], [theMAKE="make"])
72047228
AC_MSG_NOTICE([==========================================================])
72057229
AC_MSG_NOTICE([Configuration complete: Run '$theMAKE' to build ${NUT_SOURCE_VERSION_REPORT} now.])
72067230
AC_MSG_NOTICE([You may use parallelism if supported by your hardware and 'make' implementation, e.g. '$theMAKE -j 8'])
7231+
AS_IF([test x"${dotMAKE}" = x.MAKE], [
7232+
AC_MSG_NOTICE([WARNING: do not use (parallel) GNU make with this build configuration!])
7233+
])
72077234
AC_MSG_NOTICE([==========================================================])

data/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ check-local:
1818
# We also have to export some variables that may be tainted by relative
1919
# paths when parsing the other makefile (e.g. MKDIR_P that may be defined
2020
# via expanded $(top_builddir)/install-sh):
21-
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
21+
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT) @dotMAKE@
2222
# +$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
2323

24-
cmdvartab-spellchecked: cmdvartab Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
24+
cmdvartab-spellchecked: cmdvartab Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT) @dotMAKE@
2525
+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
2626

27-
spellcheck spellcheck-interactive spellcheck-sortdict:
27+
spellcheck spellcheck-interactive spellcheck-sortdict: @dotMAKE@
2828
+$(MAKE) -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC="cmdvartab" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
2929

3030
MAINTAINERCLEANFILES = Makefile.in .dirstamp

data/htmlcgi/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ SPELLCHECK_SRC = README.adoc
1717
# We also have to export some variables that may be tainted by relative
1818
# paths when parsing the other makefile (e.g. MKDIR_P that may be defined
1919
# via expanded $(top_builddir)/install-sh):
20-
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
20+
#%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT) @dotMAKE@
2121
# +$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
2222

2323
# NOTE: Portable suffix rules do not allow prerequisites, so we shim them here
2424
# by a wildcard target in case the make implementation can put the two together.
2525
*-spellchecked: Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
2626

27-
.sample.sample-spellchecked:
27+
.sample.sample-spellchecked: @dotMAKE@
2828
+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
2929

30-
.in.in-spellchecked:
30+
.in.in-spellchecked: @dotMAKE@
3131
+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
3232

33-
spellcheck spellcheck-interactive spellcheck-sortdict:
33+
spellcheck spellcheck-interactive spellcheck-sortdict: @dotMAKE@
3434
+$(MAKE) -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC="$(SPELLCHECK_SRC)" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
3535

3636
CLEANFILES = *-spellchecked

docs/Makefile.am

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EXTRA_DIST =
3131
# generated once (can take a looong while), settled into place, and only then
3232
# we revisit them for html/pdf rendering (another long while) without randomly
3333
# confusing the system with new timestamps and needless regenerations later on.
34-
all:
34+
all: @dotMAKE@
3535
@echo " DOC-FOLLOW-UP Basic 'make $@' in `pwd` is done, following up with 'make doc' to ensure complex document types"
3636
+@$(MAKE) $(AM_MAKEFLAGS) doc
3737

@@ -218,15 +218,15 @@ CHECK_LOCAL_TARGETS = @DOC_CHECK_LIST@
218218
if WITH_SPELLCHECK
219219
CHECK_LOCAL_TARGETS += spellcheck
220220
endif WITH_SPELLCHECK
221-
check-local: $(CHECK_LOCAL_TARGETS)
221+
check-local: $(CHECK_LOCAL_TARGETS) @dotMAKE@
222222
+@cd $(builddir)/man && $(MAKE) $(AM_MAKEFLAGS) check
223223

224224
# Make sure sources are there for out-of-tree builds:
225225
all-local all-am-local \
226226
$(DOC_BUILD_CHANGELOG_TEXT) $(DOC_BUILD_CHANGELOG_ADOC) \
227227
@DOC_BUILD_LIST@ $(ASCIIDOC_PDF) $(ASCIIDOC_HTML_SINGLE) $(ASCIIDOC_HTML_CHUNKED): $(abs_top_builddir)/docs/.prep-src-docs
228228

229-
all-local:
229+
all-local: @dotMAKE@
230230
+@cd $(builddir)/man && $(MAKE) $(AM_MAKEFLAGS) all-optional
231231

232232
# This list is defined by configure script choices and options:
@@ -371,7 +371,7 @@ ChangeLog.html-contentchecked:
371371
exit 1
372372

373373
check-html-single: .check-html-single
374-
.check-html-single: $(ASCIIDOC_HTML_SINGLE) Makefile
374+
.check-html-single: $(ASCIIDOC_HTML_SINGLE) Makefile @dotMAKE@
375375
+@FAILED=""; LANG=C; LC_ALL=C; export LANG; export LC_ALL; \
376376
for F in $(ASCIIDOC_HTML_SINGLE) ; do \
377377
test -s "$$F" && { file "$$F" | $(EGREP) -i '(XML|HTML.*document)' > /dev/null ; } || FAILED="$$FAILED $$F" ; \
@@ -408,11 +408,11 @@ check-html-chunked: .check-html-chunked
408408
# NOTE; we rig it up with a DOCS_NO_MAN option to simplify parallel work
409409
# from top-level Makefile, while allowing legacy "cd docs && make" to
410410
# still do the right thing by default :)
411-
check-man check-man-man all-man man-man all-html html-man:
411+
check-man check-man-man all-man man-man all-html html-man: @dotMAKE@
412412
+@if [ x"$(DOCS_NO_MAN)" = xtrue ] ; then echo " DOC-NOT-MAN SKIP: $@ called in docs/Makefile" ; exit 0 ; fi ; \
413413
cd $(abs_top_builddir)/docs/man/ && $(MAKE) $(AM_MAKEFLAGS) -f Makefile $@
414414

415-
man:
415+
man: @dotMAKE@
416416
+@if [ x"$(DOCS_NO_MAN)" = xtrue ] ; then echo " DOC-NOT-MAN SKIP: $@ called in docs/Makefile" ; exit 0 ; fi ; \
417417
cd $(abs_top_builddir)/docs/man/ && $(MAKE) $(AM_MAKEFLAGS) -f Makefile all
418418

@@ -434,7 +434,7 @@ MAINTAINER_ASCIIDOCS_CHANGELOG_DEBUG = no
434434
# Work around some documents that have originally included
435435
# the asciidoc markup (use double-hash to avoid conversion).
436436
# The $< is okay here, it is used in a suffix rule below
437-
.adoc.adoc-parsed:
437+
.adoc.adoc-parsed: @dotMAKE@
438438
+@if [ ! -s '$<' ] ; then \
439439
echo " DOC-ASCIIDOC-GITHUB-LINKS STRANGE: input $< does not exist or is empty" >&2 ; \
440440
$(MAKE) $(AM_MAKEFLAGS) '$<' ; \
@@ -478,7 +478,7 @@ $(top_builddir)/ChangeLog.adoc-parsed: $(top_builddir)/ChangeLog.adoc
478478
CLEANFILES += .ChangeLog.adoc-parsed.latest
479479

480480
dummy:
481-
$(top_builddir)/ChangeLog: dummy
481+
$(top_builddir)/ChangeLog: dummy @dotMAKE@
482482
@+echo " DOC-CHANGELOG-GENERATE-WRAPPER $@ : call parent Makefile to decide if (re-)generation is needed" \
483483
&& cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
484484

@@ -581,7 +581,7 @@ solaris-usb.html solaris-usb.chunked solaris-usb.pdf: solaris-usb.txt asciidoc.c
581581
# to look at is cause to run a recipe always). We define recipes outside
582582
# the suffix-based handling and require *them* for default target builds.
583583
ChangeLog.html ChangeLog.chunked ChangeLog.pdf: ChangeLog.txt .ChangeLog.adoc-parsed.latest asciidoc.conf
584-
$(top_builddir)/docs/ChangeLog.html $(top_builddir)/docs/ChangeLog.chunked $(top_builddir)/docs/ChangeLog.pdf: ChangeLog.txt $(top_builddir)/ChangeLog.adoc-parsed asciidoc.conf
584+
$(top_builddir)/docs/ChangeLog.html $(top_builddir)/docs/ChangeLog.chunked $(top_builddir)/docs/ChangeLog.pdf: ChangeLog.txt $(top_builddir)/ChangeLog.adoc-parsed asciidoc.conf @dotMAKE@
585585
@+if [ -s '$(@F)' ] && [ x"`find '$(@F)' -newer '$(top_builddir)/ChangeLog.adoc-parsed'`" != x ] ; then \
586586
echo " DOC-CHANGELOG-RENDER-WRAPPER SKIP: `pwd`/$(@F) already exists and is newer than ChangeLog.adoc-parsed" ; \
587587
if [ x"$(MAINTAINER_ASCIIDOCS_CHANGELOG_DEBUG)" != xno ] ; then \
@@ -766,9 +766,9 @@ GENERATE_HTML_SINGLE = ( \
766766
)
767767

768768
*.html: common.xsl xhtml.xsl
769-
.txt-prepped.html:
769+
.txt-prepped.html: @dotMAKE@
770770
+@$(GENERATE_HTML_SINGLE)
771-
.adoc-prepped.html:
771+
.adoc-prepped.html: @dotMAKE@
772772
+@$(GENERATE_HTML_SINGLE)
773773

774774
# Note: extra age check here because *.chunked is a directory and not all
@@ -965,22 +965,22 @@ SPELLCHECK_AUTO_ONE = ( \
965965
|| { RES=$$? ; touch '$@'.failed; exit $$RES; } \
966966
)
967967

968-
.txt.txt-spellchecked-auto:
968+
.txt.txt-spellchecked-auto: @dotMAKE@
969969
+@$(SPELLCHECK_AUTO_ONE)
970970

971-
.adoc.adoc-spellchecked-auto:
971+
.adoc.adoc-spellchecked-auto: @dotMAKE@
972972
+@$(SPELLCHECK_AUTO_ONE)
973973

974-
.in.in-spellchecked-auto:
974+
.in.in-spellchecked-auto: @dotMAKE@
975975
+@$(SPELLCHECK_AUTO_ONE)
976976

977-
.sample.sample-spellchecked-auto:
977+
.sample.sample-spellchecked-auto: @dotMAKE@
978978
+@$(SPELLCHECK_AUTO_ONE)
979979

980-
.conf.conf-spellchecked-auto:
980+
.conf.conf-spellchecked-auto: @dotMAKE@
981981
+@$(SPELLCHECK_AUTO_ONE)
982982

983-
spellcheck:
983+
spellcheck: @dotMAKE@
984984
@if test "$(SPELLCHECK_ENV_DEBUG)" = detailed ; then \
985985
echo "ASPELL DEBUG : information about the setup follows:"; \
986986
LANG=$(ASPELL_ENV_LANG); LC_ALL=$(ASPELL_ENV_LANG); export LANG; export LC_ALL; \
@@ -1069,7 +1069,7 @@ DISTCLEANFILES += $(NUT_SPELL_DICT).bak-pre-sorting $(NUT_SPELL_DICT).bak-pre-in
10691069
# that their dictionary was updated and may need a Git recommit - either
10701070
# if it did change, or if caller's SPELLCHECK_REPORT_MAYBE_UPDATED_DICT=yes.
10711071
SPELLCHECK_REPORT_MAYBE_UPDATED_DICT = no
1072-
spellcheck-interactive:
1072+
spellcheck-interactive: @dotMAKE@
10731073
@rm -f $(abs_builddir)/$(NUT_SPELL_DICT).bak-pre-interactive || true
10741074
@cp -pf $(abs_srcdir)/$(NUT_SPELL_DICT) $(abs_builddir)/$(NUT_SPELL_DICT).bak-pre-interactive
10751075
+@FAILED="" ; for docsrc in $(SPELLCHECK_SRC); do \

0 commit comments

Comments
 (0)