[Spice-commits] 2 commits - docs/Makefile.am docs/meson.build .gitignore

[GitLab Mirror]

 .gitignore       |    3 +--
 docs/Makefile.am |   11 +++++++----
 docs/meson.build |   14 ++++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 7f1481dce6b1aec5f1e7187d67fb8812d1908f6d
Author: Victor Toso <me at victortoso.com>
Date:   Mon Oct 14 13:40:43 2019 +0200

    docs: update Makefile to match meson dist
    
    Sort the files names in alphabetic order and include the .html
    version for spice_for_newbies and spice_protocol
    
    Signed-off-by: Victor Toso <victortoso at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/.gitignore b/.gitignore
index bf618932..965e2df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,7 @@ INSTALL
 .tarball-version
 docs/manual/manual.chunked/
 docs/manual/manual.html
-docs/spice_style.html
-docs/spice_threading_model.html
+docs/*.html
 .dirstamp
 .deps
 .libs
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 15fbbdc0..1c96bcae 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -3,13 +3,16 @@ ASCIIDOC_FLAGS = -a icons -a toc
 
 EXTRA_DIST =					\
 	meson.build				\
+	spice_for_newbies.html			\
+	spice_for_newbies.txt			\
+	spice_protocol.html			\
+	spice_protocol.txt			\
 	spice_style.html			\
 	spice_style.txt				\
 	spice_threading_model.html		\
 	spice_threading_model.txt		\
+	vd_interfaces.html			\
 	vd_interfaces.txt			\
-	spice_protocol.txt			\
-	spice_for_newbies.txt			\
 	images/newbies/g_cmd_flow.png		\
 	images/newbies/g_sub.png		\
 	images/newbies/cli_bsc_stc.png		\
@@ -18,11 +21,11 @@ EXTRA_DIST =					\
 	$(NULL)
 
 HTML_FILES = \
+	spice_for_newbies.html \
+	spice_protocol.html \
 	spice_style.html \
 	spice_threading_model.html \
 	vd_interfaces.html \
-	spice_protocol.html \
-	spice_for_newbies.html \
 	$(NULL)
 
 if BUILD_MANUAL
commit a3bf9f06b3be5e4f5c873bb674bb799df7382e5a
Author: Victor Toso <me at victortoso.com>
Date:   Mon Oct 14 13:40:42 2019 +0200

    docs: include protocol and for-newbies documents
    
    Only by building and sharing the documents we will be able to get them
    up to date.
    
    Signed-off-by: Victor Toso <victortoso at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/docs/meson.build b/docs/meson.build
index 82864bb8..ce0334c0 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,11 +1,17 @@
+asciidoc_files = ['spice_for_newbies',
+                  'spice_protocol',
+                  'spice_style',
+                  'spice_threading_model',
+                  'vd_interfaces']
+
 if get_option('manual')
   asciidoc = find_program('asciidoc', required : false)
   if asciidoc.found()
     asciidoc_args = ['-a', 'data-uri', '-a', 'icons', '-a', 'toc']
-    foreach doc : ['style', 'threading_model']
-      custom_target('spice_ at 0@.html'.format(doc),
-                    input : 'spice_ at 0@.txt'.format(doc),
-                    output : 'spice_ at 0@.html'.format(doc),
+    foreach doc : asciidoc_files
+      custom_target('@0 at .html'.format(doc),
+                    input : '@0 at .txt'.format(doc),
+                    output : '@0 at .html'.format(doc),
                     build_by_default: true,
                     command : [asciidoc, '-n', asciidoc_args, '-o', '@OUTPUT@', '@INPUT@'])
     endforeach