diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2021-06-08 12:28:49 -0400 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2021-06-08 12:28:49 -0400 |
| commit | ea3bd58289096b82d2e03a334fce437030740a25 (patch) | |
| tree | d769458e3d66352f97e1a5ce165277388e90be5e | |
| parent | f34f4b6c0048179171a790b2ac5c73dce0be35c6 (diff) | |
validate: use `extract_objects` to avoid rebuilding all files for the tracer
And add the tracer to the plugins list so it can be used in our
uninstalled environment.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/250>
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | validate/gst/validate/meson.build | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meson.build b/meson.build index b451749..e9063dd 100644 --- a/meson.build +++ b/meson.build @@ -148,6 +148,7 @@ if get_option('default_library') == 'shared' endif pkgconfig_subdirs = ['gstreamer-1.0'] +plugins_doc_dep = [] plugins = [] i18n = import('i18n') diff --git a/validate/gst/validate/meson.build b/validate/gst/validate/meson.build index d08586f..d04f1a4 100644 --- a/validate/gst/validate/meson.build +++ b/validate/gst/validate/meson.build @@ -1,5 +1,4 @@ gstvalidate_sources = [ - 'gst-validate-runner.c', 'gst-validate-reporter.c', 'gst-validate-mockdecryptor.c', 'gst-validate-monitor.c', @@ -58,7 +57,7 @@ gst_validate_enums = gnome.mkenums('gstvalidateenumtypes', validate_deps = [gst_check_dep, gst_dep, gst_controller_dep, gstbase_dep, glib_dep, gio_dep, gmodule_dep, gst_pbutils_dep, mathlib, json_dep] gstvalidate = library('gstvalidate-1.0', - sources: gstvalidate_sources + gst_validate_enums, + sources: files('gst-validate-runner.c') + gstvalidate_sources + gst_validate_enums, version : libversion, soversion : soversion, darwin_versions : osxversion, @@ -68,13 +67,15 @@ gstvalidate = library('gstvalidate-1.0', dependencies : validate_deps) gstvalidatetracer = library('gstvalidatetracer', - sources: gstvalidate_sources + gst_validate_enums, + sources: files('gst-validate-runner.c') + gst_validate_enums, include_directories : [inc_dirs], install: true, c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'], install_dir : plugins_install_dir, + objects: gstvalidate.extract_objects(gstvalidate_sources), dependencies : validate_deps) +plugins += gstvalidatetracer pkgconfig.generate(gstvalidate, libraries : [gst_dep], subdirs : pkgconfig_subdirs, |