X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=subprojects%2Fgst-plugins-base%2Fgst-libs%2Fgst%2Fpbutils%2Fmeson.build;h=52feb47f0153d8e4b9a2367ae43c56dce8285df0;hb=6e79932ad99fe4ebae2fc089d188ce4f7700e769;hp=085384aedad1a14af6994751756f79af9bd3a1f6;hpb=d975e07edc3bf5b17c811bb901712ca231a970ea;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
index 085384a..52feb47 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
@@ -1,4 +1,4 @@
-pbutils_sources = [
+pbutils_sources = files([
   'gstpluginsbaseversion.c',
   'pbutils.c',
   'codec-utils.c',
@@ -10,7 +10,7 @@ pbutils_sources = [
   'gstaudiovisualizer.c',
   'gstdiscoverer.c',
   'gstdiscoverer-types.c'
-  ]
+])
 
 pbconf = configuration_data()
 pbconf.set('PACKAGE_VERSION_MAJOR', gst_version_major)
@@ -22,7 +22,7 @@ gst_pbutils_version_h = configure_file(input : 'gstpluginsbaseversion.h.in',
   install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/pbutils'),
   configuration: pbconf)
 
-pbutils_headers = [
+pbutils_headers = files([
   'pbutils.h',
   'pbutils-prelude.h',
   'codec-utils.h',
@@ -33,7 +33,7 @@ pbutils_headers = [
   'missing-plugins.h',
   'gstdiscoverer.h',
   'gstaudiovisualizer.h',
-]
+])
 install_headers(pbutils_headers, subdir : 'gstreamer-1.0/gst/pbutils/')
 
 pbutils_mkenum_headers = pbutils_headers
@@ -60,33 +60,42 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
   dependencies : gstpbutils_deps,
 )
 
+library_def = {'lib': pbutils}
+pkg_name = 'gstreamer-pbutils-1.0'
 pkgconfig.generate(pbutils,
   libraries : [gst_dep, video_dep, audio_dep, gst_base_dep],
   variables : pkgconfig_variables,
   subdirs : pkgconfig_subdirs,
-  name : 'gstreamer-pbutils-1.0',
+  name : pkg_name,
   description : 'General utility functions',
 )
 
 pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
 if build_gir
   gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
-  pbutils_gir = gnome.generate_gir(pbutils,
-    sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
-    namespace : 'GstPbutils',
-    nsversion : api_version,
-    identifier_prefix : 'Gst',
-    symbol_prefix : 'gst',
-    export_packages : 'gstreamer-pbutils-1.0',
-    includes : ['Gst-1.0', 'GstBase-1.0', 'GstAudio-1.0', 'GstVideo-1.0'],
-    install : true,
-    extra_args : gst_gir_extra_args,
-    dependencies : gstpbutils_deps
-  )
-  pbutils_gen_sources += [pbutils_gir]
+  gir = {
+    'sources' : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
+    'namespace' : 'GstPbutils',
+    'nsversion' : api_version,
+    'identifier_prefix' : 'Gst',
+    'symbol_prefix' : 'gst',
+    'export_packages' : pkg_name,
+    'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstAudio-1.0', 'GstVideo-1.0'],
+    'install' : true,
+    'extra_args' : gst_gir_extra_args,
+    'dependencies' : gstpbutils_deps
+  }
+  library_def = {'lib': library_def['lib'], 'gir': [gir]}
+  if not static_build
+    pbutils_gir = gnome.generate_gir(pbutils, kwargs: gir)
+    pbutils_gen_sources += [pbutils_gir]
+  endif
 endif
+libraries += [[pkg_name, library_def]]
 
 pbutils_dep = declare_dependency(link_with : pbutils,
   include_directories : [libsinc],
   dependencies : gstpbutils_deps,
   sources : pbutils_gen_sources)
+
+meson.override_dependency(pkg_name, pbutils_dep)
\ No newline at end of file