diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-10-17 00:35:50 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-10-17 14:33:04 +0000 |
| commit | a30dcd9951ed5814ca1974a31db83756bfb5b233 (patch) | |
| tree | 06730698c58aed168a619f6c6fc43f3a5e07baa1 /docbook | |
| parent | 632b7d19d770e5215f1e89c363e3afab56369a53 (diff) | |
| download | wireshark-a30dcd9951ed5814ca1974a31db83756bfb5b233.tar.gz | |
cmake: fix missing docbook dependency
Running "ninja developer_guide_html" somehow did not produce a new HTML
docbook once wsluarm.ascii (a dependency of developer-guide.xml) was
modified.
It turns out that output file docbook/wsdg_html/index.html only had a
ordering-only dependency on target generate_developer-guide.xml. An
extra dependency is needed on the output file to ensure that the HTML
file gets rebuild on changes.
See the last note on
https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/
Fixes v2.1.0rc0-2137-gd544ecd ("cmake: fix parallel docbook build").
Change-Id: I7689c71994f13b29cf7f8561f7c993aa8298632d
Reviewed-on: https://code.wireshark.org/review/18225
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/CMakeLists.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 6424810242..5138e8422a 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -525,3 +525,16 @@ ASCIIDOC2TXT( # "${ASCIIDOC_CONF_FILES}" # letter #) + +# +# Editor modelines - http://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 8 +# tab-width: 8 +# indent-tabs-mode: t +# End: +# +# vi: set shiftwidth=8 tabstop=8 noexpandtab: +# :indentSize=8:tabSize=8:noTabs=false: +# |