summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-06-09 23:22:34 +0200
committerThomas Haller <thaller@redhat.com>2020-06-10 23:56:23 +0200
commit5a8c5a2b57f14dd68eb8b392cd775f28cabc3c09 (patch)
tree023014b3a2289354ebf745237479d12192a65b1f
parent3ad5df78a6dbb34d9c0bf4e7b69afb748964c8ea (diff)
downloadNetworkManager-5a8c5a2b57f14dd68eb8b392cd775f28cabc3c09.tar.gz
docs: move generate-docs scripts from "libnm/" to "tools/"
They are not only used in "libnm/" directory. Move to "tools/".
-rw-r--r--Makefile.am18
-rw-r--r--libnm/meson.build4
-rw-r--r--man/meson.build4
-rwxr-xr-xtools/generate-docs-nm-property-infos.pl (renamed from libnm/generate-docs-nm-property-infos.pl)0
-rwxr-xr-xtools/generate-docs-nm-settings-docs-gir.py (renamed from libnm/generate-docs-nm-settings-docs-gir.py)0
-rwxr-xr-xtools/generate-docs-nm-settings-docs-merge.py (renamed from libnm/generate-docs-nm-settings-docs-merge.py)0
6 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 006869f928..ac40aee84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1572,21 +1572,21 @@ noinst_DATA += $(libnm_noinst_data)
libnm_docs_sources = $(libnm_core_lib_c_settings_real)
-libnm/nm-property-infos-%.xml: libnm/generate-docs-nm-property-infos.pl $(libnm_docs_sources)
- $(AM_V_GEN) $(srcdir)/libnm/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^)
+libnm/nm-property-infos-%.xml: tools/generate-docs-nm-property-infos.pl $(libnm_docs_sources)
+ $(AM_V_GEN) $(srcdir)/tools/generate-docs-nm-property-infos.pl $(patsubst nm-property-infos-%.xml,%,$(notdir $@)) $@ $(filter-out $<,$^)
-libnm/nm-settings-docs-gir.xml: libnm/generate-docs-nm-settings-docs-gir.py libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la $(libnm_docs_sources)
+libnm/nm-settings-docs-gir.xml: tools/generate-docs-nm-settings-docs-gir.py libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la $(libnm_docs_sources)
$(AM_V_GEN) \
export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
$(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \
"$(PYTHON)" \
- $(srcdir)/libnm/generate-docs-nm-settings-docs-gir.py \
+ $(srcdir)/tools/generate-docs-nm-settings-docs-gir.py \
--gir $(builddir)/libnm/NM-1.0.gir \
--output $@
-man/nm-settings-docs-%.xml: libnm/nm-property-infos-%.xml libnm/nm-settings-docs-gir.xml libnm/generate-docs-nm-settings-docs-merge.py
- $(AM_V_GEN) "$(PYTHON)" $(srcdir)/libnm/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^)
+man/nm-settings-docs-%.xml: libnm/nm-property-infos-%.xml libnm/nm-settings-docs-gir.xml tools/generate-docs-nm-settings-docs-merge.py
+ $(AM_V_GEN) "$(PYTHON)" $(srcdir)/tools/generate-docs-nm-settings-docs-merge.py $@ $(wordlist 1,2,$^)
EXTRA_DIST += $(libnm_noinst_data)
DISTCLEANFILES += $(libnm_noinst_data)
@@ -1594,9 +1594,9 @@ DISTCLEANFILES += $(libnm_noinst_data)
endif
EXTRA_DIST += \
- libnm/generate-docs-nm-property-infos.pl \
- libnm/generate-docs-nm-settings-docs-merge.py \
- libnm/generate-docs-nm-settings-docs-gir.py \
+ tools/generate-docs-nm-property-infos.pl \
+ tools/generate-docs-nm-settings-docs-merge.py \
+ tools/generate-docs-nm-settings-docs-gir.py \
libnm/meson.build \
libnm/nm-enum-types.c.template \
libnm/nm-enum-types.h.template \
diff --git a/libnm/meson.build b/libnm/meson.build
index aab946ece6..d3991ab19c 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -223,7 +223,7 @@ if enable_introspection
output: 'nm-propery-infos-' + info + '.xml',
command: [
perl,
- join_paths(meson.current_source_dir(), 'generate-docs-nm-property-infos.pl'),
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.pl'),
info,
'@OUTPUT@',
'@INPUT@'
@@ -284,7 +284,7 @@ if enable_introspection
command: [
generate_setting_docs_env,
python.path(),
- join_paths(meson.current_source_dir(), 'generate-docs-nm-settings-docs-gir.py'),
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
'--lib-path', meson.current_build_dir(),
'--gir', '@INPUT@',
'--output', '@OUTPUT@'
diff --git a/man/meson.build b/man/meson.build
index c2fc150792..5e76a9f1be 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -64,7 +64,7 @@ if enable_introspection
output: 'nm-settings-docs-' + name + '.xml',
command: [
python.path(),
- join_paths(meson.source_root(), 'libnm', 'generate-docs-nm-settings-docs-merge.py'),
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
'@OUTPUT@',
nm_property_infos_xml[name],
nm_settings_docs_xml_gir,
@@ -79,7 +79,7 @@ if enable_introspection
output: 'nm-settings-docs-' + name + '.xml',
command: [
python.path(),
- join_paths(meson.source_root(), 'libnm', 'generate-docs-nm-settings-docs-merge.py'),
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
'@OUTPUT@',
nm_property_infos_xml[name],
nm_settings_docs_xml_gir,
diff --git a/libnm/generate-docs-nm-property-infos.pl b/tools/generate-docs-nm-property-infos.pl
index bbdec3b632..bbdec3b632 100755
--- a/libnm/generate-docs-nm-property-infos.pl
+++ b/tools/generate-docs-nm-property-infos.pl
diff --git a/libnm/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
index f63c48b1ae..f63c48b1ae 100755
--- a/libnm/generate-docs-nm-settings-docs-gir.py
+++ b/tools/generate-docs-nm-settings-docs-gir.py
diff --git a/libnm/generate-docs-nm-settings-docs-merge.py b/tools/generate-docs-nm-settings-docs-merge.py
index 64f899ff17..64f899ff17 100755
--- a/libnm/generate-docs-nm-settings-docs-merge.py
+++ b/tools/generate-docs-nm-settings-docs-merge.py