From 029edcb46f1fc7353ff6fe730f08c668f9133eef Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Tue, 22 Jun 2021 11:20:32 +0200 Subject: all: Allow use as subproject --- libgupnp-dlna/meson.build | 32 +++++++++++++++------- .../gstreamer/gupnp-dlna-gst-information.h | 2 +- .../gstreamer/gupnp-dlna-gst-metadata-extractor.h | 4 +-- .../metadata-backends/gstreamer/meson.build | 16 +++++++---- meson.build | 10 +++---- tools/meson.build | 4 +-- 6 files changed, 42 insertions(+), 26 deletions(-) diff --git a/libgupnp-dlna/meson.build b/libgupnp-dlna/meson.build index ea79d37..ae942e2 100644 --- a/libgupnp-dlna/meson.build +++ b/libgupnp-dlna/meson.build @@ -1,5 +1,7 @@ headers_subdir = 'gupnp-dlna-2.0/libgupnp-dlna' +metadata_incdir = include_directories('metadata') + loader_sources = files( 'gupnp-dlna-profile-loader.c' ) @@ -12,7 +14,10 @@ libloader = static_library( '-DDATA_DIR="@0@"'.format(shareddir) ], dependencies : [glib, gio, xml], - include_directories: include_directories('..') + include_directories: [ + toplevel_incdir, + config_h_inc + ] ) guesser_sources = files( @@ -28,10 +33,11 @@ libguesser = static_library( '-DG_LOG_DOMAIN="gupnp-dlna-guesser"', '-DDATA_DIR="@0@"'.format(shareddir) ], - include_directories: include_directories( - '..', - 'metadata' - ) + include_directories: [ + toplevel_incdir, + metadata_incdir, + config_h_inc + ] ) metadata_sources = files( @@ -47,10 +53,11 @@ libmetadata = static_library( '-DG_LOG_DOMAIN="gupnp-dlna-metadata"', '-DDATA_DIR="@0@"'.format(shareddir) ], - include_directories: include_directories( - '..', - 'metadata' - ) + include_directories: [ + toplevel_incdir, + metadata_incdir, + config_h_inc + ] ) headers = files( @@ -109,7 +116,10 @@ libgupnp_dlna = library( ], dependencies: [glib, gio, gmodule], c_args : ['-DG_LOG_DOMAIN="gupnp-dlna"'], - include_directories: include_directories('..'), + include_directories: [ + include_directories('..'), + config_h_inc + ], install: true ) @@ -118,6 +128,8 @@ gupnp_dlna = declare_dependency( include_directories: [include_directories('.'), include_directories('..')], ) +meson.override_dependency('gupnp-dlna-2.0', gupnp_dlna) + pkg.generate( libgupnp_dlna, version: meson.project_version(), diff --git a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h index a71dfc1..fb17b44 100644 --- a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h +++ b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h @@ -26,7 +26,7 @@ #include #include -#include "gupnp-dlna-information.h" +#include G_BEGIN_DECLS diff --git a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-metadata-extractor.h b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-metadata-extractor.h index f8160b4..f1bd6ca 100644 --- a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-metadata-extractor.h +++ b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-metadata-extractor.h @@ -25,8 +25,8 @@ #define _GUPNP_DLNA_GST_METADATA_EXTRACTOR #include -#include "gupnp-dlna-metadata-extractor.h" -#include "gupnp-dlna-information.h" +#include +#include G_BEGIN_DECLS diff --git a/libgupnp-dlna/metadata-backends/gstreamer/meson.build b/libgupnp-dlna/metadata-backends/gstreamer/meson.build index 298b381..f6da4eb 100644 --- a/libgupnp-dlna/metadata-backends/gstreamer/meson.build +++ b/libgupnp-dlna/metadata-backends/gstreamer/meson.build @@ -23,13 +23,18 @@ libgupnp_dlna_gst = library( gio, gstreamer_pbu, gstreamer, - config_dep, gupnp_dlna ], + include_directories : [ + toplevel_incdir, + metadata_incdir, + config_h_inc], c_args : ['-DG_LOG_DOMAIN="gupnp-dlna-metadata"'], install: true ) +meson.override_dependency('gupnp-dlna-gst-2.0', libgupnp_dlna_gst) + shared_module( 'gstreamer', files( @@ -40,12 +45,11 @@ shared_module( dependencies : [ glib, gstreamer_pbu, - config_dep, ], - include_directories : include_directories( - '../../metadata', - '../..' - ), + include_directories : [ + toplevel_incdir, + metadata_incdir, + config_h_inc], install: true, install_dir : metadata_backend_dir ) diff --git a/meson.build b/meson.build index 3819ef8..1d2f3b1 100644 --- a/meson.build +++ b/meson.build @@ -15,17 +15,17 @@ config = configuration_data() config.set_quoted('GUPNP_DLNA_DEFAULT_METADATA_BACKEND', get_option('default_backend')) config.set_quoted('GUPNP_DLNA_DEFAULT_METADATA_BACKEND_DIR', metadata_backend_dir) -configure_file(output: 'config.h', configuration: config) -add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c') + +# Generate config.h +subdir('internal') +add_project_arguments('-DHAVE_CONFIG_H=1', language : 'c') +toplevel_incdir = include_directories('.') glib = dependency('glib-2.0') gobject = dependency('gobject-2.0') gio = dependency('gio-2.0') gmodule = dependency('gmodule-2.0') xml = dependency('libxml-2.0') -config_dep = declare_dependency( - include_directories : include_directories('.') -) gstreamer = dependency('gstreamer-1.0', required: get_option('gstreamer_backend'), disabler : true) gstreamer_pbu = dependency('gstreamer-pbutils-1.0', required: get_option('gstreamer_backend'), disabler : true) diff --git a/tools/meson.build b/tools/meson.build index 1c4ecbe..c84d7e4 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -5,9 +5,9 @@ executable( glib, gobject, xml, - config_dep, gupnp_dlna ], + include_directories : config_h_inc, install: true ) @@ -18,8 +18,8 @@ executable( glib, gobject, xml, - config_dep, gupnp_dlna ], + include_directories : config_h_inc, install: true ) -- cgit v1.2.1