colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: only generate "settings-docs.h" with "--enable-gtk-doc"

Browse Source 
Note that "--enable-gtk-doc" requires "--enable-introspection".

For generating "settings-docs.h" we (only) need introspection/pygobject.
We also have a pre-generated .in file that we can use if introspection
is not available. Since we have a pre-generated variant, it would be fine
to always use that one. However, we want to use generate the file if we
have the necessary dependencies, because thereby we can check whether
the pre-generated file is identical to what would be generated.

We have a similar problem with "generate-docs-nm-settings-nmcli.xml".
However there we don't need introspection, but merely being able to
execute a binary that we build. That does not work during cross
compilation, so we will honor "--enable-gtk-doc" flag to decide when
to generate the file.

For consistency, also adjust the condition for "settings-docs.h" to only
generate the file if we have "--enable-gtk-doc" (but not it we build
with "--enable-introspection" alone).
This commit is contained in:
Thomas Haller
2020-11-01 17:57:33 +01:00
parent 6968c4141c
commit a208da4139
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -4453,7 +4453,7 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
clients_common_settings_doc_h = clients/common/settings-docs.h clients_common_settings_doc_h = clients/common/settings-docs.h
if HAVE_INTROSPECTION if BUILD_DOCS
$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp $(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-settings-docs-gir.xml clients/common/.dirstamp
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
DISTCLEANFILES += $(clients_common_settings_doc_h) DISTCLEANFILES += $(clients_common_settings_doc_h)

2
clients/common/meson.build
View File

@@ -31,7 +31,7 @@ libnmc_base_dep = declare_dependency(
settings_docs = 'settings-docs.h' settings_docs = 'settings-docs.h'
if enable_introspection if enable_docs
settings_docs_source = custom_target( settings_docs_source = custom_target(
settings_docs, settings_docs,
input: nm_settings_docs_xml_gir, input: nm_settings_docs_xml_gir,