meson: Namespace the plugins_doc_dep/libraries variables

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2970>
2024-11-25 11:11:08 +00:00 · 2022-09-01 11:51:48 -04:00 · 2022-09-01 11:51:48 -04:00 · bc9c1e3956
commit bc9c1e3956
parent c971a6d71f
57 changed files with 66 additions and 66 deletions
--- a/meson.build
+++ b/meson.build
@ -184,7 +184,7 @@ foreach sp : subprojects
      endforeach
    endif

-    all_libraries += subproj.get_variable('libraries', [])
+    all_libraries += subproj.get_variable('gst_libraries', [])
    if not get_option('tools').disabled()
      all_tools += subproj.get_variable('gst_tools', {})
    endif
@ -194,7 +194,7 @@ foreach sp : subprojects
    subprojects_names += [project_name]

    if not meson.is_cross_build() and build_infos.get('build-hotdoc', false)
-      plugins_doc_caches += [subproj.get_variable('plugins_doc_dep', [])]
+      plugins_doc_caches += [subproj.get_variable('gst_plugins_doc_dep', [])]
      if documented_projects != ''
        documented_projects += ','
      endif
@ -210,7 +210,7 @@ if glib_dep.type_name() == 'internal'
             default_options: ['gnutls=auto', 'openssl=auto'])
 endif

-plugins_doc_dep = custom_target('plugins-doc-cache',
+gst_plugins_doc_dep = custom_target('plugins-doc-cache',
  command: [python3, '-c', 'print("Built all doc caches")'],
  input: plugins_doc_caches,
  output: 'plugins_doc_caches',
--- a/subprojects/gst-devtools/meson.build
+++ b/subprojects/gst-devtools/meson.build
@ -150,12 +150,12 @@ if get_option('default_library') == 'shared'
 endif
 pkgconfig_subdirs = ['gstreamer-1.0']

-plugins_doc_dep = []
+gst_plugins_doc_dep = []
 plugins = []
 i18n = import('i18n')

 static_build = get_option('default_library') == 'static'
-libraries = []
+gst_libraries = []

 python_mod = import('python')
 python3 = python_mod.find_installation()
--- a/subprojects/gst-devtools/validate/gst/validate/meson.build
+++ b/subprojects/gst-devtools/validate/gst/validate/meson.build
@ -121,7 +121,7 @@ if build_gir
      validate_gen_sources += [validate_gir]
    endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 validate_dep = declare_dependency(link_with : gstvalidate,
  include_directories : [inc_dirs],
--- a/subprojects/gst-editing-services/docs/meson.build
+++ b/subprojects/gst-editing-services/docs/meson.build
@ -38,7 +38,7 @@ endif
 plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')

 if plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('editing-services-doc-cache',
+    gst_plugins_doc_dep = custom_target('editing-services-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-editing-services/ges/meson.build
+++ b/subprojects/gst-editing-services/ges/meson.build
@ -225,7 +225,7 @@ endif
 # GESImageSource is unused and is internal only so it gets stripped out when we statically
 # link GES. We keep the header for backward compatibility reasons.
 install_headers(ges_headers + files('ges-image-source.h'), subdir : 'gstreamer-1.0/ges')
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 ges_dep = declare_dependency(link_with : libges,
  include_directories : [configinc],
--- a/subprojects/gst-editing-services/meson.build
+++ b/subprojects/gst-editing-services/meson.build
@ -266,7 +266,7 @@ pkgconfig = import('pkgconfig')
 pkgconfig_subdirs = ['gstreamer-1.0']

 configinc = include_directories('.')
-libraries = []
+gst_libraries = []

 subdir('ges')
 subdir('plugins')
--- a/subprojects/gst-libav/docs/meson.build
+++ b/subprojects/gst-libav/docs/meson.build
@ -29,7 +29,7 @@ endif

 plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')
 if plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('libav-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('libav-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
@ -83,6 +83,6 @@ plugins_doc = [hotdoc.generate_doc('libav',
    gst_c_sources: ['../ext/*/*.[ch]',],
    gst_cache_file: plugins_cache,
    gst_plugin_name: 'libav',
-    dependencies: [gst_dep, gstlibav_plugin, plugins_doc_dep],
+    dependencies: [gst_dep, gstlibav_plugin, gst_plugins_doc_dep],
    disable_incremental_build: true,
 )]
--- a/subprojects/gst-omx/docs/meson.build
+++ b/subprojects/gst-omx/docs/meson.build
@ -21,7 +21,7 @@ endif

 plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')
 if plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('omx-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('omx-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-plugins-bad/docs/meson.build
+++ b/subprojects/gst-plugins-bad/docs/meson.build
@ -40,7 +40,7 @@ plugins_cache = join_paths(meson.current_source_dir(), 'plugins', 'gst_plugins_c
 if plugins.length() == 0
    message('All bad plugins have been disabled')
 elif plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('bad-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('bad-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/meson.build
@ -12,7 +12,7 @@ gstadaptivedemux = library('gstadaptivedemux-' + api_version,
  install : true,
  dependencies : [gstbase_dep, gsturidownloader_dep],
 )
-libraries += [[pkg_name, {'lib': gstadaptivedemux}]]
+gst_libraries += [[pkg_name, {'lib': gstadaptivedemux}]]

 gstadaptivedemux_dep = declare_dependency(link_with : gstadaptivedemux,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build
@ -44,7 +44,7 @@ if build_gir
    gen_sources += audio_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstbadaudio_dep = declare_dependency(link_with : gstbadaudio,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/meson.build
@ -71,5 +71,5 @@ gstcodecparsers_dep = declare_dependency(link_with : gstcodecparsers,
  include_directories : [libsinc],
  dependencies : [gstbase_dep])

-libraries += [[pkg_name, {'lib': gstcodecparsers}]]
+gst_libraries += [[pkg_name, {'lib': gstcodecparsers}]]
 meson.override_dependency(pkg_name, gstcodecparsers_dep)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build
@ -75,7 +75,7 @@ if build_gir
    gen_sources += codecs_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstcodecs_dep = declare_dependency(link_with : gstcodecs,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/cuda/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/cuda/meson.build
@ -86,7 +86,7 @@ if build_gir

  library_def += {'gir': [gir, cuda_gir]}
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 pkgconfig.generate(gstcuda,
  libraries : [gstbase_dep, gmodule_dep, gstvideo_dep, gstglproto_dep],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
@ -217,7 +217,7 @@ if build_gir

  library_def += {'gir': [gir]}
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 install_headers(d3d11_headers, subdir : 'gstreamer-1.0/gst/d3d11')

--- a/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build
@ -43,7 +43,7 @@ if build_gir
    gen_sources += insertbin_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstinsertbin_dep = declare_dependency(link_with : gstinsertbin,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/interfaces/meson.build
@ -38,5 +38,5 @@ gstphotography_dep = declare_dependency(link_with : gstphotography,
  dependencies : [gst_dep],
  sources : [photoenum_h])

-libraries += [[pkg_name, {'lib': gstphotography}]]
+gst_libraries += [[pkg_name, {'lib': gstphotography}]]
 meson.override_dependency(pkg_name, gstphotography_dep)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build
@ -75,7 +75,7 @@ if build_gir
    gen_sources += mpegts_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstmpegts_dep = declare_dependency(link_with : gstmpegts,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build
@ -39,7 +39,7 @@ if opencv_dep.found()
    dependencies : [gstbase_dep, gstvideo_dep, opencv_dep],
  )

-  libraries += [[pkg_name, {'lib': gstopencv}]]
+  gst_libraries += [[pkg_name, {'lib': gstopencv}]]
  gstopencv_dep = declare_dependency(link_with: gstopencv,
    include_directories : [libsinc],
    dependencies : [gstvideo_dep, opencv_dep])
--- a/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build
@ -65,7 +65,7 @@ if build_gir
    gen_sources += play_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstplay_dep = declare_dependency(link_with : gstplay,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build
@ -68,7 +68,7 @@ if build_gir
    gen_sources += player_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstplayer_dep = declare_dependency(link_with : gstplayer,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/sctp/meson.build
@ -22,7 +22,7 @@ libgstsctp = library('gstsctp-' + api_version,
 )

 pkg_name = 'gstreamer-sctp-1.0'
-libraries += [[pkg_name, {'lib': libgstsctp}]]
+gst_libraries += [[pkg_name, {'lib': libgstsctp}]]
 pkgconfig.generate(libgstsctp,
  libraries : [gst_dep],
  variables : pkgconfig_variables,
--- a/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/transcoder/meson.build
@ -56,7 +56,7 @@ if build_gir
    transcoder_gen_sources += transcoder_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_transcoder_dep = declare_dependency(link_with: gst_transcoder,
  dependencies : [gst_dep, gstpbutils_dep],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/uridownloader/meson.build
@ -26,5 +26,5 @@ gsturidownloader_dep = declare_dependency(link_with : gsturidownloader,
  include_directories : [libsinc],
  dependencies : [gstbase_dep])

-libraries += [[pkg_name, {'lib': gsturidownloader}]]
+gst_libraries += [[pkg_name, {'lib': gsturidownloader}]]
 meson.override_dependency(pkg_name, gsturidownloader_dep)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
@ -62,7 +62,7 @@ gstva = library('gstva-' + api_version,
 )

 pkg_name = 'gstreamer-va-' + api_version
-libraries += [[pkg_name, {'lib': gstva}]]
+gst_libraries += [[pkg_name, {'lib': gstva}]]

 gstva_dep = declare_dependency(link_with : gstva,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
@ -359,7 +359,7 @@ if build_gir
    gen_sources += vulkan_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gstvulkan_dep = declare_dependency(link_with : gstvulkan,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/wayland/meson.build
@ -78,7 +78,7 @@ if use_wayland
  )

  pkg_name = 'gstreamer-wayland-1.0'
-  libraries += [[pkg_name, {'lib': gstwayland}]]
+  gst_libraries += [[pkg_name, {'lib': gstwayland}]]
  pkgconfig.generate(gstwayland,
    libraries : [gst_dep, gstvideo_dep],
    variables : pkgconfig_variables,
--- a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build
@ -91,7 +91,7 @@ if build_gir
    webrtc_gen_sources += webrtc_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 install_headers(webrtc_headers, subdir : 'gstreamer-1.0/gst/webrtc')

--- a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/meson.build
@ -49,7 +49,7 @@ if libnice_dep.found()
  )

  pkg_name = 'gstreamer-webrtc-nice-1.0'
-  libraries += [[pkg_name, {'lib': libgstwebrtcnice}]]
+  gst_libraries += [[pkg_name, {'lib': libgstwebrtcnice}]]
  pkgconfig.generate(libgstwebrtcnice,
    libraries : [deps],
    variables : pkgconfig_variables,
--- a/subprojects/gst-plugins-bad/meson.build
+++ b/subprojects/gst-plugins-bad/meson.build
@ -37,7 +37,7 @@ osxversion = curversion + 1
 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
 static_build = get_option('default_library') == 'static'
 plugins = []
-libraries = []
+gst_libraries = []

 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
--- a/subprojects/gst-plugins-base/docs/meson.build
+++ b/subprojects/gst-plugins-base/docs/meson.build
@ -41,7 +41,7 @@ plugins_cache = join_paths(meson.current_source_dir(), 'plugins', 'gst_plugins_c
 if plugins.length() == 0
    message('All base plugins have been disabled')
 elif plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('base-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('base-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build
@ -50,7 +50,7 @@ if build_gir
    allocators_gen_sources += allocators_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 allocators_dep = declare_dependency(link_with: gstallocators,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build
@ -60,7 +60,7 @@ if build_gir
    app_gen_sources += app_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 app_dep = declare_dependency(link_with: gstapp,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
@ -181,7 +181,7 @@ if build_gir
    audio_gen_sources += [audio_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 audio_dep = declare_dependency(link_with : gstaudio,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/fft/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/fft/meson.build
@ -43,7 +43,7 @@ pkgconfig.generate(gstfft,
  name : pkg_name,
  description : 'FFT implementation',
 )
-libraries += [[pkg_name, {'lib': gstfft}]]
+gst_libraries += [[pkg_name, {'lib': gstfft}]]

 fft_dep = declare_dependency(link_with: gstfft,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
@ -1105,7 +1105,7 @@ if build_gstgl
      gen_sources += [gl_gir]
    endif
  endif
-  libraries += [[pkg_name, library_def]]
+  gst_libraries += [[pkg_name, library_def]]
  gstgl_dep = declare_dependency(link_with : gstgl,
    include_directories : [libsinc, compat_includes],
    sources: gen_sources,
@ -1142,7 +1142,7 @@ if build_gstgl
        'dependencies' : [video_dep, gst_dep, gst_base_dep]
      }
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
-      libraries += [[pkg_name, {'gir': gir_dict}]]
+      gst_libraries += [[pkg_name, {'gir': gir_dict}]]
      if not static_build
        gir += {'includes': gir['includes'] + [gl_gir[0]]}
        gl_x11_gir = gnome.generate_gir(gstgl, kwargs: gir)
@ -1179,7 +1179,7 @@ if build_gstgl
      }

      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
-      libraries += [[pkg_name, {'gir': gir_dict}]]
+      gst_libraries += [[pkg_name, {'gir': gir_dict}]]
      if not static_build
        gir += {'includes': gir['includes'] + [gl_gir[0]]}
        gl_wayland_gir = gnome.generate_gir(gstgl, kwargs: gir)
@ -1214,7 +1214,7 @@ if build_gstgl
        'dependencies' : [video_dep, gst_dep, gst_base_dep]
      }
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
-      libraries += [[pkg_name, {'gir': gir_dict}]]
+      gst_libraries += [[pkg_name, {'gir': gir_dict}]]
      if not static_build
        gir += {'includes': gir['includes'] + [gl_gir[0]]}
        gl_egl_gir = gnome.generate_gir(gstgl, kwargs: gir)
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
@ -91,7 +91,7 @@ if build_gir
    pbutils_gen_sources += [pbutils_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 pbutils_dep = declare_dependency(link_with : pbutils,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/riff/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/riff/meson.build
@ -35,7 +35,7 @@ pkgconfig.generate(gstriff,
 )

 riff_gen_sources  = []
-libraries += [[pkg_name, {'lib': gstriff}]]
+gst_libraries += [[pkg_name, {'lib': gstriff}]]

 # *** GIR DISABLED for this library ***
 # This library does not respect the type naming conventions required to be
--- a/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build
@ -77,7 +77,7 @@ if build_gir
    rtp_gen_sources += [rtp_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 rtp_dep = declare_dependency(link_with : gst_rtp,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build
@ -82,7 +82,7 @@ if build_gir
    rtsp_gen_sources += [rtsp_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 rtsp_dep = declare_dependency(link_with : gst_rtsp,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build
@ -52,7 +52,7 @@ if build_gir
    sdp_gen_sources += [sdp_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 sdp_dep = declare_dependency(link_with: gstsdp,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
@ -115,7 +115,7 @@ if build_gir
    tag_gen_sources += [tag_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 tag_dep = declare_dependency(link_with: gsttag,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build
@ -175,7 +175,7 @@ if build_gir
    video_gen_sources += [video_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 video_dep = declare_dependency(link_with : gstvideo,
  include_directories : [libsinc],
--- a/subprojects/gst-plugins-base/meson.build
+++ b/subprojects/gst-plugins-base/meson.build
@ -47,7 +47,7 @@ osxversion = curversion + 1
 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
 static_build = get_option('default_library') == 'static'
 plugins = []
-libraries = []
+gst_libraries = []

 cc = meson.get_compiler('c')

--- a/subprojects/gst-plugins-good/docs/meson.build
+++ b/subprojects/gst-plugins-good/docs/meson.build
@ -31,7 +31,7 @@ plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')
 if plugins.length() == 0
    message('All good plugins have been disabled')
 elif plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('good-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('good-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-plugins-ugly/docs/meson.build
+++ b/subprojects/gst-plugins-ugly/docs/meson.build
@ -31,7 +31,7 @@ endif
 if plugins.length() == 0
    message('All ugly plugins have been disabled')
 elif plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('ugly-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('ugly-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-rtsp-server/docs/meson.build
+++ b/subprojects/gst-rtsp-server/docs/meson.build
@ -41,7 +41,7 @@ plugins_cache = join_paths(meson.current_source_dir(), 'plugins', 'gst_plugins_c
 if plugins.length() == 0
    message('All rtsp-server plugins have been disabled')
 elif plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('rtsp-server-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('rtsp-server-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
@ -98,7 +98,7 @@ if build_gir
    rtsp_server_gen_sources += [rtsp_server_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_rtsp_server_dep = declare_dependency(link_with : gst_rtsp_server,
  include_directories : rtspserver_incs,
--- a/subprojects/gst-rtsp-server/meson.build
+++ b/subprojects/gst-rtsp-server/meson.build
@ -191,7 +191,7 @@ endif
 plugins = []
 pkgconfig_subdirs = ['gstreamer-1.0']
 static_build = get_option('default_library') == 'static'
-libraries = []
+gst_libraries = []

 subdir('gst')
 if not get_option('tests').disabled()
--- a/subprojects/gstreamer-vaapi/docs/meson.build
+++ b/subprojects/gstreamer-vaapi/docs/meson.build
@ -29,7 +29,7 @@ endif

 plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')
 if plugins_cache_generator.found()
-    plugins_doc_dep = custom_target('vaapi-plugins-doc-cache',
+    gst_plugins_doc_dep = custom_target('vaapi-plugins-doc-cache',
        command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
        input: plugins,
        output: 'gst_plugins_cache.json',
--- a/subprojects/gstreamer/docs/meson.build
+++ b/subprojects/gstreamer/docs/meson.build
@ -36,7 +36,7 @@ configure_file(

 plugins_cache_generator = find_program(join_paths(meson.current_build_dir(), 'gst-plugins-doc-cache-generator'))
 plugins_cache = join_paths(meson.current_source_dir(), 'plugins', 'gst_plugins_cache.json')
-plugins_doc_dep = custom_target('build-doc-cache',
+gst_plugins_doc_dep = custom_target('build-doc-cache',
    command: [plugins_cache_generator, plugins_cache, '@OUTPUT@', '@INPUT@'],
    input: plugins,
    output: 'gst_plugins_cache.json',
@ -169,7 +169,7 @@ plugins_doc = [
        gst_index: 'plugins/index.md',
        gst_smart_index: true,
        gst_c_sources: ['../plugins/elements/*.c', '../plugins/elements/*.h'],
-        dependencies: [plugins_doc_dep],
+        dependencies: [gst_plugins_doc_dep],
        gst_cache_file: plugins_cache,
        gst_plugin_name: 'coreelements',
    ),
@ -180,7 +180,7 @@ plugins_doc = [
        gst_index: 'plugins/coretracers/index.md',
        gst_smart_index: true,
        gst_c_sources: ['../plugins/tracers/*.c', '../plugins/tracers/*.h'],
-        dependencies: [plugins_doc_dep],
+        dependencies: [gst_plugins_doc_dep],
        gst_cache_file: plugins_cache,
        gst_plugin_name: 'coretracers',
    )
--- a/subprojects/gstreamer/gst/meson.build
+++ b/subprojects/gstreamer/gst/meson.build
@ -302,7 +302,7 @@ if build_gir
    gst_gen_sources += gst_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_compile_args = []
 if get_option('default_library') == 'static'
--- a/subprojects/gstreamer/libs/gst/base/meson.build
+++ b/subprojects/gstreamer/libs/gst/base/meson.build
@ -82,7 +82,7 @@ if build_gir
    gst_base_gen_sources += [gst_base_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_base_dep = declare_dependency(link_with : gst_base,
  include_directories : [libsinc],
--- a/subprojects/gstreamer/libs/gst/check/meson.build
+++ b/subprojects/gstreamer/libs/gst/check/meson.build
@ -84,7 +84,7 @@ if build_gir
    gst_check_gen_sources += gst_check_gir
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_check_dep = declare_dependency(link_with : gst_check,
  include_directories : [libsinc],
--- a/subprojects/gstreamer/libs/gst/controller/meson.build
+++ b/subprojects/gstreamer/libs/gst/controller/meson.build
@ -79,7 +79,7 @@ if build_gir
    gst_controller_gen_sources += [gst_controller_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_controller_dep = declare_dependency(link_with : gst_controller,
  include_directories : [libsinc],
--- a/subprojects/gstreamer/libs/gst/net/meson.build
+++ b/subprojects/gstreamer/libs/gst/net/meson.build
@ -66,7 +66,7 @@ if build_gir
    gst_net_gen_sources += [gst_net_gir]
  endif
 endif
-libraries += [[pkg_name, library_def]]
+gst_libraries += [[pkg_name, library_def]]

 gst_net_dep = declare_dependency(link_with : gst_net,
  include_directories : [libsinc],
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@ -623,7 +623,7 @@ if host_system == 'darwin'
 endif

 static_build = get_option('default_library') == 'static'
-libraries = []
+gst_libraries = []
 subdir('gst')
 subdir('libs')
 subdir('plugins')