| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Thu, 22 Mar 2018 11:08:30 +0100 |
| 4 | Subject: [PATCH] Do not create settings settings/property documentation |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | It was tried to get this work but gi / GirRepository could not be found by |
| 10 | python. Anyway it is not necessary for us to have the settings/property docs. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [OE specific] |
| 13 | |
| 14 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 15 | --- |
| 16 | Makefile.am | 18 ++---------------- |
| 17 | configure.ac | 4 ---- |
| 18 | 2 files changed, 2 insertions(+), 20 deletions(-) |
| 19 | |
| 20 | diff --git a/Makefile.am b/Makefile.am |
| 21 | index 639921d..314a61d 100644 |
| 22 | --- a/Makefile.am |
| 23 | +++ b/Makefile.am |
| 24 | @@ -961,9 +961,7 @@ endif |
| 25 | if HAVE_INTROSPECTION |
| 26 | |
| 27 | libnm_noinst_data = \ |
| 28 | - libnm/nm-property-docs.xml \ |
| 29 | libnm/nm-settings-docs-overrides.xml \ |
| 30 | - libnm/nm-settings-docs.xml \ |
| 31 | libnm/nm-settings-keyfile-docs.xml \ |
| 32 | libnm/nm-settings-ifcfg-rh-docs.xml |
| 33 | |
| 34 | @@ -3317,23 +3315,11 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) |
| 35 | $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp |
| 36 | |
| 37 | clients_common_settings_doc_c = clients/common/settings-docs.c |
| 38 | -if HAVE_INTROSPECTION |
| 39 | -$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp |
| 40 | - $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) |
| 41 | -DISTCLEANFILES += $(clients_common_settings_doc_c) |
| 42 | -check-local-settings-docs: $(clients_common_settings_doc_c) |
| 43 | - @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ |
| 44 | - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ |
| 45 | - echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ |
| 46 | - false; \ |
| 47 | - fi;\ |
| 48 | - fi |
| 49 | -check_local += check-local-settings-docs |
| 50 | -else |
| 51 | + |
| 52 | $(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp |
| 53 | $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" |
| 54 | check-local-settings-docs: |
| 55 | -endif |
| 56 | + |
| 57 | EXTRA_DIST += \ |
| 58 | $(clients_common_settings_doc_c) \ |
| 59 | $(clients_common_settings_doc_c).in |
| 60 | diff --git a/configure.ac b/configure.ac |
| 61 | index c9d3e56..407222e 100644 |
| 62 | --- a/configure.ac |
| 63 | +++ b/configure.ac |
| 64 | @@ -1286,10 +1286,6 @@ GTK_DOC_CHECK(1.0) |
| 65 | # check if we can build setting property documentation |
| 66 | build_docs=no |
| 67 | if test -n "$INTROSPECTION_MAKEFILE"; then |
| 68 | - # If g-i is installed we know we have python, but we might not have pygobject |
| 69 | - if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then |
| 70 | - AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) |
| 71 | - fi |
| 72 | |
| 73 | AC_PATH_PROG(PERL, perl) |
| 74 | if test -z "$PERL"; then |
| 75 | -- |
| 76 | 2.14.3 |
| 77 | |