Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 1 | From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 | --- |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 13 | meson.build | 3 +-- |
| 14 | modulemd/v1/meson.build | 8 -------- |
| 15 | modulemd/v2/meson.build | 12 ------------ |
| 16 | 3 files changed, 1 insertion(+), 22 deletions(-) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | |
| 18 | diff --git a/meson.build b/meson.build |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 19 | index 5a0cd3d..f51b16e 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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') |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 30 | @@ -127,4 +126,4 @@ configure_file( |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 31 | ) |
| 32 | |
| 33 | subdir('modulemd') |
| 34 | -subdir('bindings/python') |
| 35 | + |
| 36 | diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 37 | index ddc95a1..e85fafd 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 38 | --- a/modulemd/v1/meson.build |
| 39 | +++ b/modulemd/v1/meson.build |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 40 | @@ -356,11 +356,3 @@ configure_file( |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 53 | index 93c7fbd..0d9ed24 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 54 | --- a/modulemd/v2/meson.build |
| 55 | +++ b/modulemd/v2/meson.build |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 56 | @@ -285,15 +285,3 @@ configure_file( |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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', |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 65 | - gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'), |
| 66 | - dependencies : [ |
| 67 | - modulemd_v2_dep, |
| 68 | - ], |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 69 | - install : true, |
| 70 | -) |
| 71 | - |