@@ -56,14 +56,6 @@ EXTRA_DIST = $(man1_MANS)
CLEANFILES = $(man1_MANS)
-.ONESHELL:
-attrs.adoc: $(srcdir)/Makefile.am
- $(AM_V_GEN) cat <<- EOF >$@
- :ndctl_monitorconfdir: $(ndctl_monitorconfdir)
- :ndctl_monitorconf: $(ndctl_monitorconf)
- :ndctl_keysdir: $(ndctl_keysdir)
- EOF
-
XML_DEPS = \
../../version.m4 \
Makefile \
@@ -76,8 +68,7 @@ XML_DEPS = \
xable-namespace-options.txt \
ars-description.txt \
labels-description.txt \
- labels-options.txt \
- attrs.adoc
+ labels-options.txt
RM ?= rm -f
@@ -88,6 +79,9 @@ if USE_ASCIIDOCTOR
$(ASCIIDOC) -b manpage -d manpage -acompat-mode \
-I. -rasciidoctor-extensions \
-amansource=ndctl -amanmanual="ndctl Manual" \
+ -andctl_monitorconf=$(ndctl_monitorconfdir)/$(ndctl_monitorconf) \
+ -andctl_monitorconfdir=$(ndctl_monitorconfdir) \
+ -andctl_keysdir=$(ndctl_keysdir) \
-andctl_version=$(VERSION) -o $@+ $< && \
mv $@+ $@
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
THEORY OF OPERATION
-------------------
The Intel Device Specific Methods (DSM) specification v1.7 and v1.8 [1]
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
ndctl-load-keys(1)
==================
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
ndctl-monitor(1)
================
@@ -21,8 +19,7 @@ objects and dumping the json format notifications to syslog, standard
output or a logfile.
The objects to monitor and smart events to notify can be selected by
-setting options and/or the configuration file at
-{ndctl_monitorconfdir}/{ndctl_monitorconf}
+setting options and/or the configuration file at {ndctl_monitorconf}
Both, the values in configuration file and in options will work. If
there is a conflict, the values in options will override the values in
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
ndctl-sanitize-dimm(1)
======================
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
ndctl-setup-passphrase(1)
=========================
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-include::attrs.adoc[]
-
ndctl-update-passphrase(1)
==========================
In preparation for switching build systems, drop the attrs.adoc include for communicating variables to asciidoc. Simply add the necessary variable values to the invocation of the command using the --attribute argument. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- Documentation/ndctl/Makefile.am | 14 ++++---------- Documentation/ndctl/intel-nvdimm-security.txt | 2 -- Documentation/ndctl/ndctl-load-keys.txt | 2 -- Documentation/ndctl/ndctl-monitor.txt | 5 +---- Documentation/ndctl/ndctl-sanitize-dimm.txt | 2 -- Documentation/ndctl/ndctl-setup-passphrase.txt | 2 -- Documentation/ndctl/ndctl-update-passphrase.txt | 2 -- 7 files changed, 5 insertions(+), 24 deletions(-)