From 22f0f11abfca812e6ec390a0fed5cddfbda03e06 Mon Sep 17 00:00:00 2001 From: Havard Graff Date: Wed, 4 Oct 2017 14:29:20 +0200 Subject: [PATCH] meson: remove vs_module_defs The GST_EXPORT should handle it. --- gst-libs/gst/adaptivedemux/meson.build | 1 - gst-libs/gst/audio/meson.build | 1 - gst-libs/gst/base/meson.build | 1 - gst-libs/gst/basecamerabinsrc/meson.build | 1 - gst-libs/gst/codecparsers/meson.build | 1 - gst-libs/gst/insertbin/meson.build | 1 - gst-libs/gst/interfaces/meson.build | 1 - gst-libs/gst/isoff/meson.build | 1 - gst-libs/gst/mpegts/meson.build | 1 - gst-libs/gst/player/meson.build | 1 - gst-libs/gst/uridownloader/meson.build | 1 - gst-libs/gst/video/meson.build | 1 - meson.build | 2 -- 13 files changed, 14 deletions(-) diff --git a/gst-libs/gst/adaptivedemux/meson.build b/gst-libs/gst/adaptivedemux/meson.build index dbc4da3..24bd465 100644 --- a/gst-libs/gst/adaptivedemux/meson.build +++ b/gst-libs/gst/adaptivedemux/meson.build @@ -6,7 +6,6 @@ gstadaptivedemux = library('gstadaptivedemux-' + api_version, soversion : soversion, install : true, dependencies : [gstbase_dep, gsturidownloader_dep], - vs_module_defs: vs_module_defs_dir + 'libgstadaptivedemux.def', ) gstadaptivedemux_dep = declare_dependency(link_with : gstadaptivedemux, diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index 2120a92..3154e3c 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -11,7 +11,6 @@ gstbadaudio = library('gstbadaudio-' + api_version, soversion : soversion, install : true, dependencies : [gstbadbase_dep, gstaudio_dep], - vs_module_defs: vs_module_defs_dir + 'libgstbadaudio.def', ) gstbadaudio_dep = declare_dependency(link_with : gstbadaudio, diff --git a/gst-libs/gst/base/meson.build b/gst-libs/gst/base/meson.build index 34203ed..7cffba0 100644 --- a/gst-libs/gst/base/meson.build +++ b/gst-libs/gst/base/meson.build @@ -10,7 +10,6 @@ gstbadbase = library('gstbadbase-' + api_version, soversion : soversion, install : true, dependencies : [gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstbadbase.def', ) gstbadbase_dep = declare_dependency(link_with : gstbadbase, diff --git a/gst-libs/gst/basecamerabinsrc/meson.build b/gst-libs/gst/basecamerabinsrc/meson.build index 4f7f16e..5452160 100644 --- a/gst-libs/gst/basecamerabinsrc/meson.build +++ b/gst-libs/gst/basecamerabinsrc/meson.build @@ -18,7 +18,6 @@ gstbasecamerabin = library('gstbasecamerabinsrc-' + api_version, soversion : soversion, install : true, dependencies : [gstapp_dep], - vs_module_defs: vs_module_defs_dir + 'libgstbasecamerabinsrc.def', ) gstbasecamerabin_dep = declare_dependency(link_with : gstbasecamerabin, diff --git a/gst-libs/gst/codecparsers/meson.build b/gst-libs/gst/codecparsers/meson.build index f45e697..12e53c9 100644 --- a/gst-libs/gst/codecparsers/meson.build +++ b/gst-libs/gst/codecparsers/meson.build @@ -46,7 +46,6 @@ gstcodecparsers = library('gstcodecparsers-' + api_version, soversion : soversion, install : true, dependencies : [gstbase_dep, libm], - vs_module_defs: vs_module_defs_dir + 'libgstcodecparsers.def', ) gstcodecparsers_dep = declare_dependency(link_with : gstcodecparsers, diff --git a/gst-libs/gst/insertbin/meson.build b/gst-libs/gst/insertbin/meson.build index acf1805..f4b8aba 100644 --- a/gst-libs/gst/insertbin/meson.build +++ b/gst-libs/gst/insertbin/meson.build @@ -10,7 +10,6 @@ gstinsertbin = library('gstinsertbin-' + api_version, soversion : soversion, install : true, dependencies : [gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstinsertbin.def', ) gen_sources = [] diff --git a/gst-libs/gst/interfaces/meson.build b/gst-libs/gst/interfaces/meson.build index 2349349..23c9846 100644 --- a/gst-libs/gst/interfaces/meson.build +++ b/gst-libs/gst/interfaces/meson.build @@ -24,7 +24,6 @@ gstphotography = library('gstphotography-' + api_version, soversion : soversion, install : true, dependencies : [gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstphotography.def', ) gstphotography_dep = declare_dependency(link_with : gstphotography, diff --git a/gst-libs/gst/isoff/meson.build b/gst-libs/gst/isoff/meson.build index 97acd0e..8666ea1 100644 --- a/gst-libs/gst/isoff/meson.build +++ b/gst-libs/gst/isoff/meson.build @@ -14,7 +14,6 @@ gstisoff = library('gstisoff-' + api_version, soversion : soversion, install : true, dependencies : [gstbase_dep], - vs_module_defs: vs_module_defs_dir + 'libgstisoff.def', ) gstisoff_dep = declare_dependency(link_with : gstisoff, diff --git a/gst-libs/gst/mpegts/meson.build b/gst-libs/gst/mpegts/meson.build index 3ff7735..49bcb69 100644 --- a/gst-libs/gst/mpegts/meson.build +++ b/gst-libs/gst/mpegts/meson.build @@ -40,7 +40,6 @@ gstmpegts = library('gstmpegts-' + api_version, soversion : soversion, install : true, dependencies : [gst_dep], - vs_module_defs: vs_module_defs_dir + 'libgstmpegts.def', ) if build_gir mpegts_gir = gnome.generate_gir(gstmpegts, diff --git a/gst-libs/gst/player/meson.build b/gst-libs/gst/player/meson.build index 57bc55b..a44d7d8 100644 --- a/gst-libs/gst/player/meson.build +++ b/gst-libs/gst/player/meson.build @@ -31,7 +31,6 @@ gstplayer = library('gstplayer-' + api_version, install : true, dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep, gsttag_dep, gstpbutils_dep], - vs_module_defs: vs_module_defs_dir + 'libgstplayer.def', ) gen_sources = [] diff --git a/gst-libs/gst/uridownloader/meson.build b/gst-libs/gst/uridownloader/meson.build index 23da672..ac97368 100644 --- a/gst-libs/gst/uridownloader/meson.build +++ b/gst-libs/gst/uridownloader/meson.build @@ -17,7 +17,6 @@ gsturidownloader = library('gsturidownloader-' + api_version, soversion : soversion, install : true, dependencies : [gstbase_dep], - vs_module_defs: vs_module_defs_dir + 'libgsturidownloader.def', ) gsturidownloader_dep = declare_dependency(link_with : gsturidownloader, diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build index b5941a6..9c38628 100644 --- a/gst-libs/gst/video/meson.build +++ b/gst-libs/gst/video/meson.build @@ -16,7 +16,6 @@ gstbadvideo = library('gstbadvideo-' + api_version, soversion : soversion, install : true, dependencies : [gstvideo_dep, gstbadbase_dep], - vs_module_defs: vs_module_defs_dir + 'libgstbadvideo.def', ) gstbadvideo_dep = declare_dependency(link_with : gstbadvideo, diff --git a/meson.build b/meson.build index 6724e6c..1d1ab3f 100644 --- a/meson.build +++ b/meson.build @@ -407,8 +407,6 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') libsinc = include_directories('gst-libs') -vs_module_defs_dir = meson.current_source_dir() + '/win32/common/' - # Used by the *_mkenum.py helper scripts glib_mkenums = find_program('glib-mkenums') -- 2.7.4