git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From b6c8039afe016d25c17cdf1b2462d6a53d49fad1 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/v1/meson.build: do not generate gir or gtkdoc
   5
   6 Both of these really need a configuration option.
   7
   8 Upstream-Status: Inappropriate [oe-core specific]
   9 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  10
  11 ---
  12  meson.build             |  1 -
  13  modulemd/v1/meson.build | 20 --------------------
  14  2 files changed, 21 deletions(-)
  15
  16 diff --git a/meson.build b/meson.build
  17 index db7c6a1..e0ea61a 100644
  18 --- a/meson.build
  19 +++ b/meson.build
  20 @@ -49,7 +49,6 @@ gnome = import('gnome')
  21  pkg = import('pkgconfig')
  22  gobject = dependency('gobject-2.0')
  23  yaml = dependency('yaml-0.1')
  24 -gtkdoc = dependency('gtk-doc')
  25
  26  spec_tmpl = find_program('spec_tmpl.sh')
  27
  28 diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
  29 index 38e0d15..d59e519 100644
  30 --- a/modulemd/v1/meson.build
  31 +++ b/modulemd/v1/meson.build
  32 @@ -311,19 +311,6 @@ if valgrind.found()
  33            timeout : 300)
  34  endif
  35
  36 -gnome.generate_gir(
  37 -    modulemd_v1_lib,
  38 -    sources : modulemd_v1_srcs + modulemd_v1_hdrs,
  39 -    nsversion : '.'.join([libmodulemd_version_array[0], '0']),
  40 -    namespace : 'Modulemd',
  41 -    symbol_prefix : 'modulemd_',
  42 -    identifier_prefix : 'Modulemd',
  43 -    includes : [
  44 -        'GObject-2.0',
  45 -    ],
  46 -    install : true,
  47 -    )
  48 -
  49  xcdata = configuration_data()
  50  xcdata.set('VERSION', libmodulemd_version)
  51  configure_file(
  52 @@ -339,13 +326,6 @@ configure_file(
  53    configuration : cdata
  54  )
  55
  56 -gnome.gtkdoc(
  57 -    'modulemd-1.0',
  58 -    install_dir: 'modulemd-1.0',
  59 -    src_dir : './',
  60 -    main_xml : 'modulemd-docs.xml',
  61 -    install : true)
  62 -
  63  pkg.generate(
  64      libraries : modulemd_v1_lib,
  65      subdirs : v1_header_path,