| Message ID | 20231211164039.83034-4-donald.hunter@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tools/net/ynl: Add 'sub-message' support to ynl | expand |
On Mon, 11 Dec 2023 16:40:31 +0000 Donald Hunter wrote: > Add ynl-gen-rst.py to the dependencies for the netlink .rst files in the > doc Makefile so that the docs get regenerated if the ynl-gen-rst.py > script is modified. Reviewed-by: Jakub Kicinski <kuba@kernel.org>
On Mon, Dec 11, 2023 at 04:40:31PM +0000, Donald Hunter wrote: > Add ynl-gen-rst.py to the dependencies for the netlink .rst files in the > doc Makefile so that the docs get regenerated if the ynl-gen-rst.py > script is modified. > > Signed-off-by: Donald Hunter <donald.hunter@gmail.com> > --- > Documentation/Makefile | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Documentation/Makefile b/Documentation/Makefile > index 5c156fbb6cdf..9a31625ea1ff 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -105,11 +105,12 @@ YNL_TOOL:=$(srctree)/tools/net/ynl/ynl-gen-rst.py > YNL_RST_FILES_TMP := $(patsubst %.yaml,%.rst,$(wildcard $(YNL_YAML_DIR)/*.yaml)) > YNL_RST_FILES := $(patsubst $(YNL_YAML_DIR)%,$(YNL_RST_DIR)%, $(YNL_RST_FILES_TMP)) > > -$(YNL_INDEX): $(YNL_RST_FILES) > +$(YNL_INDEX): $(YNL_RST_FILES) $(YNL_TOOL) > @$(YNL_TOOL) -o $@ -x > > -$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml > - @$(YNL_TOOL) -i $< -o $@ > +$(YNL_RST_DIR)/%.rst: $(YNL_TOOL) > +$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL) > + $(YNL_TOOL) -i $< -o $@ Why do you need both lines here? Isn't the last line enough? $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL)
On Tue, 12 Dec 2023 at 20:39, Breno Leitao <leitao@debian.org> wrote: > > > +$(YNL_RST_DIR)/%.rst: $(YNL_TOOL) > > +$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL) > > + $(YNL_TOOL) -i $< -o $@ > > Why do you need both lines here? Isn't the last line enough? > > $(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL) Good catch. I didn't intend to leave that first line in. Thanks!
diff --git a/Documentation/Makefile b/Documentation/Makefile index 5c156fbb6cdf..9a31625ea1ff 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -105,11 +105,12 @@ YNL_TOOL:=$(srctree)/tools/net/ynl/ynl-gen-rst.py YNL_RST_FILES_TMP := $(patsubst %.yaml,%.rst,$(wildcard $(YNL_YAML_DIR)/*.yaml)) YNL_RST_FILES := $(patsubst $(YNL_YAML_DIR)%,$(YNL_RST_DIR)%, $(YNL_RST_FILES_TMP)) -$(YNL_INDEX): $(YNL_RST_FILES) +$(YNL_INDEX): $(YNL_RST_FILES) $(YNL_TOOL) @$(YNL_TOOL) -o $@ -x -$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml - @$(YNL_TOOL) -i $< -o $@ +$(YNL_RST_DIR)/%.rst: $(YNL_TOOL) +$(YNL_RST_DIR)/%.rst: $(YNL_YAML_DIR)/%.yaml $(YNL_TOOL) + $(YNL_TOOL) -i $< -o $@ htmldocs: $(YNL_INDEX) @$(srctree)/scripts/sphinx-pre-install --version-check
Add ynl-gen-rst.py to the dependencies for the netlink .rst files in the doc Makefile so that the docs get regenerated if the ynl-gen-rst.py script is modified. Signed-off-by: Donald Hunter <donald.hunter@gmail.com> --- Documentation/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)