Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From b77c9c3d07430b014b2d1bff42027f483c81f15a Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 6 Nov 2018 13:43:00 +0100 |
| 4 | Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python |
| 5 | bindings |
| 6 | |
| 7 | All of these really need a configuration option. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe-core specific] |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | |
| 12 | --- |
| 13 | meson.build | 3 +-- |
| 14 | modulemd/v1/meson.build | 8 -------- |
| 15 | modulemd/v2/meson.build | 8 -------- |
| 16 | 3 files changed, 1 insertion(+), 18 deletions(-) |
| 17 | |
| 18 | diff --git a/meson.build b/meson.build |
| 19 | index 228bd34..a1e60bb 100644 |
| 20 | --- a/meson.build |
| 21 | +++ b/meson.build |
| 22 | @@ -52,7 +52,6 @@ gnome = import('gnome') |
| 23 | pkg = import('pkgconfig') |
| 24 | gobject = dependency('gobject-2.0') |
| 25 | yaml = dependency('yaml-0.1') |
| 26 | -gtkdoc = dependency('gtk-doc') |
| 27 | |
| 28 | sh = find_program('sh') |
| 29 | sed = find_program('sed') |
| 30 | @@ -110,4 +109,4 @@ configure_file( |
| 31 | ) |
| 32 | |
| 33 | subdir('modulemd') |
| 34 | -subdir('bindings/python') |
| 35 | + |
| 36 | diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build |
| 37 | index 74db89a..4d54e69 100644 |
| 38 | --- a/modulemd/v1/meson.build |
| 39 | +++ b/modulemd/v1/meson.build |
| 40 | @@ -341,11 +341,3 @@ configure_file( |
| 41 | configuration : xcdata |
| 42 | ) |
| 43 | |
| 44 | -gnome.gtkdoc( |
| 45 | - 'modulemd-1.0', |
| 46 | - install_dir: 'modulemd-1.0', |
| 47 | - src_dir : './modulemd/v1', |
| 48 | - main_xml : 'modulemd-v1-docs.xml', |
| 49 | - install : true, |
| 50 | -) |
| 51 | - |
| 52 | diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build |
| 53 | index 7b94e0c..c5f72b9 100644 |
| 54 | --- a/modulemd/v2/meson.build |
| 55 | +++ b/modulemd/v2/meson.build |
| 56 | @@ -530,11 +530,3 @@ configure_file( |
| 57 | configuration : xcdata |
| 58 | ) |
| 59 | |
| 60 | -gnome.gtkdoc( |
| 61 | - 'modulemd-2.0', |
| 62 | - install_dir: 'modulemd-2.0', |
| 63 | - src_dir : './modulemd/v2', |
| 64 | - main_xml : 'modulemd-v2-docs.xml', |
| 65 | - install : true, |
| 66 | -) |
| 67 | - |