Skip to content

Commit 30d2ab0

Browse files
committed
Use consistent silencing of make messages when building man pages.
Fix adoc formatting warnings.
1 parent 058f77c commit 30d2ab0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

docs/src/Submakefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -997,10 +997,11 @@ TARGETS += manpages
997997
# For more information, see https://github.com/asciidoc/asciidoc/issues/44
998998
GENERATED_MANPAGES += $(patsubst $(DOC_DIR)/src/man/%.adoc, $(DOC_DIR)/man/%, $(wildcard $(DOC_DIR)/src/man/man?/*.adoc))
999999
$(DOC_DIR)/man/%: $(DOC_DIR)/src/man/%.adoc
1000-
@mkdir -p `dirname $@`
1001-
a2x -v --doctype manpage \
1000+
$(ECHO) Making manpage $(notdir $@)
1001+
@mkdir -p $(dir $@)
1002+
$(Q)a2x --doctype manpage \
10021003
--format manpage \
1003-
--destination-dir `dirname $@` \
1004+
--destination-dir $(dir $@) \
10041005
--xsltproc-opts="--nonet" \
10051006
-a mansource=LinuxCNC \
10061007
-a manmanual='LinuxCNC Documentation' \

docs/src/man/man1/halui.1.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ contact) connect the physical button to a HAL debounce filter first.
168168
**halui.mdi-command-**_XX_ bit in::
169169
*halui* looks for INI variables named [HALUI]MDI_COMMAND, and exports
170170
a pin for each command it finds. When the pin is driven TRUE, *halui*
171-
runs the specified MDI command. _XX_ is a two digit number starting at
172-
00. If no [HALUI]MDI_COMMAND variables are set in the INI file, no
171+
runs the specified MDI command. _XX_ is a two digit number starting
172+
at 00. If no [HALUI]MDI_COMMAND variables are set in the INI file, no
173173
halui.mdi-command-XX pins will be exported by halui.
174174

175175
=== Mist coolant

docs/src/man/man1/monitor-xhc-hb04.1.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ monitor-xhc-hb04 - monitors the XHC-HB04 pendant and warns of disconnection
1414
This script runs in the background and will pop up a message when the pendant is disconnected or reconnected.
1515

1616
Usage is optional; if used it is specified with INI file entry:
17-
```
18-
[APPLICATIONS]
19-
APP = monitor-xhc-hb04
20-
```
17+
[literal]
18+
[APPLICATIONS]
19+
APP = monitor-xhc-hb04
2120

2221
== SEE ALSO
2322

docs/src/man/man1/xhc-hb04.1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pins 3) connect buttons to motion.* pins
287287
Another script is included to monitor the pendant and report loss of USB connectivity.
288288
See the README and .txt files in the above directory for usage.
289289

290-
[Note]
290+
=== Note
291291
The sim configs use the AXIS GUI but the scripts are available
292292
with any HAL configuration or GUI. The same scripts can be used to adapt
293293
the xhc-hb04 to existing configurations provided that the halui, motion,

src/hal/components/Submakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ $(COMP_MANPAGES): ../docs/man/man9/%.9: hal/components/%.comp ../bin/halcompile
5858
$(ECHO) Making halcompile manpage $(notdir $@)
5959
@mkdir -p $(dir $@)
6060
$(Q)../bin/halcompile -U --document -o $@.new $< && preconv -r < $@.new > $@
61-
$(RM) $@.new
61+
$(Q)$(RM) $@.new
6262

6363
$(COMP_DRIVER_MANPAGES): ../docs/man/man9/%.9: hal/drivers/%.comp ../bin/halcompile
6464
$(ECHO) Making halcompile manpage $(notdir $@)

0 commit comments

Comments
 (0)