Skip to content

Commit

Permalink
Unreviewed. Fix make distcheck.
Browse files Browse the repository at this point in the history
* gtk/GNUmakefile.am: Remove generate-webkitdom-doc-files from
EXTRA_DIST and add webkitdom.py.
* gtk/generate-gtkdoc:
(generate_documentation_for_config): Do not try to use
generator.saw_warnings when rebasing, it's only set when
generating the docs.
  • Loading branch information
carlosgcampos committed May 26, 2014
1 parent 3c154f8 commit f208d10
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
11 changes: 11 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,14 @@
2014-05-26 Carlos Garcia Campos <cgarcia@igalia.com>

Unreviewed. Fix make distcheck.

* gtk/GNUmakefile.am: Remove generate-webkitdom-doc-files from
EXTRA_DIST and add webkitdom.py.
* gtk/generate-gtkdoc:
(generate_documentation_for_config): Do not try to use
generator.saw_warnings when rebasing, it's only set when
generating the docs.

2014-05-20 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
Expand Down
4 changes: 2 additions & 2 deletions Tools/gtk/GNUmakefile.am
Expand Up @@ -4,8 +4,8 @@ EXTRA_DIST += \
Tools/gtk/generate-feature-defines-files \
Tools/gtk/generate-gtkdoc \
Tools/gtk/generate-inspector-gresource-manifest.py \
Tools/gtk/generate-webkitdom-doc-files \
Tools/gtk/gtkdoc.py
Tools/gtk/gtkdoc.py \
Tools/gtk/webkitdom.py

docs: docs-build.stamp
.PHONY : docs
Expand Down
7 changes: 3 additions & 4 deletions Tools/gtk/generate-gtkdoc
Expand Up @@ -149,10 +149,9 @@ def generate_documentation_for_config(config_file):
return

if not arguments.rebase:
generate_doc(generator, arguments.skip_html)
else:
rebase_doc(generator)
return generator.saw_warnings
return generate_doc(generator, arguments.skip_html)

rebase_doc(generator)

def prepare_environment_for_gtkdoc_generation():
# We need to add the JavaScriptCore build directory to the PKG_CONFIG_PATH
Expand Down

0 comments on commit f208d10

Please sign in to comment.