[Openvpn-devel,2.5] doc/Makefile: rebuild rst docs if input files change

Message ID 20220210104445.16767-1-frank@lichtenheld.com
State Accepted
Headers show
Series [Openvpn-devel,2.5] doc/Makefile: rebuild rst docs if input files change | expand

Commit Message

Frank Lichtenheld Feb. 9, 2022, 11:44 p.m. UTC
For now the dependencies are statically defined, which
should be fine and is still a much better solution than
to have no dependencies.

Also delete empty example-fingerprint.rst.

(cherry picked from commit 529cc6a52fc45a1a67abb5c91819ba4fb2f631e3)
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 doc/Makefile.am                          | 19 ++++++++++++++-----
 doc/man-sections/example-fingerprint.rst |  0
 2 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 doc/man-sections/example-fingerprint.rst

diff --git a/doc/man-sections/example-fingerprint.rst b/doc/man-sections/example-fingerprint.rst
deleted file mode 100644
index e69de29b..00000000

Comments

Gert Doering Feb. 13, 2022, 2:43 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Taking David's ACK on the "master" patch, adding my own for "yes, it's
the same patch, just not caring about example-fingerprint.rst" (plus,
remove the stray 0-byte file we acquired on the way).

thanks.

Your patch has been applied to the release/2.5 branch.

commit 71f7d5f00546a5667bcb62f4139eaf9666f1445a
Author: Frank Lichtenheld
Date:   Thu Feb 10 11:44:45 2022 +0100

     doc/Makefile: rebuild rst docs if input files change

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220210104445.16767-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23747.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/doc/Makefile.am b/doc/Makefile.am
index db73cef5..cc9a661c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,15 +23,11 @@  build_html_pages = openvpn.8.html openvpn-examples.5.html
 dist_doc_DATA = \
 	management-notes.txt gui-notes.txt
 
-dist_noinst_DATA = \
-	README.plugins interactive-service-notes.rst \
-	openvpn.8.rst \
-	openvpn-examples.5.rst \
+openvpn_sections = \
 	man-sections/advanced-options.rst \
 	man-sections/client-options.rst \
 	man-sections/connection-profiles.rst \
 	man-sections/encryption-options.rst \
-	man-sections/examples.rst \
 	man-sections/generic-options.rst \
 	man-sections/inline-files.rst \
 	man-sections/link-options.rst \
@@ -52,6 +48,19 @@  dist_noinst_DATA = \
 	man-sections/vpn-network-options.rst \
 	man-sections/windows-options.rst
 
+openvpn_examples_sections = \
+	man-sections/examples.rst
+
+dist_noinst_DATA = \
+	README.plugins interactive-service-notes.rst \
+	openvpn.8.rst \
+	openvpn-examples.5.rst \
+	$(openvpn_sections) \
+	$(openvpn_examples_sections)
+
+# dependencies
+openvpn.8 openvpn.8.html: $(openvpn_sections)
+openvpn-examples.5 openvpn-examples.5.html: $(openvpn_examples_sections)
 
 ######  GENERIC  RULES  ##########