diff --git a/meson.build b/meson.build index 4554556b690b33772d16ef173e453e6cfdec12b2..9d247b988974a2cff4c9b1352154bd4079130adf 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,9 @@ project('phosh', 'c', ) app_id = 'sm.puri.Phosh' -inc_subdir = 'libphosh-0' +lib_inc_subdir = 'libphosh-0' +ver_parts = meson.project_version().split('.') +soversion = '@0@_@1@'.format(ver_parts[0], ver_parts[1]) prefix = get_option('prefix') bindir = join_paths(prefix, get_option('bindir')) @@ -24,7 +26,7 @@ plugins_dir = join_paths(prefix, libdir, 'phosh', 'plugins') plugin_prefs_dir = join_paths(prefix, libdir, 'phosh', 'plugins', 'prefs') servicedir = join_paths(datadir, 'dbus-1', 'services') schemasdir = datadir / 'glib-2.0/schemas' -inc_dir = prefix / get_option('includedir') / inc_subdir +lib_inc_dir = prefix / get_option('includedir') / lib_inc_subdir enable_introspection = get_option('introspection') or get_option('gtk_doc') bindings_lib = get_option('bindings-lib') @@ -236,7 +238,7 @@ configure_file( output: 'phosh-config.h', configuration: config_h, install: bindings_lib, - install_dir: inc_dir, + install_dir: lib_inc_dir, ) subdir('data') diff --git a/protocol/meson.build b/protocol/meson.build index 10cdfffa3524902e9f455396473911cd09d2b91e..d856cea77506092fad0500d195fa95c2d953fecb 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -39,7 +39,7 @@ foreach p : wl_protos 'client-header', '@INPUT@', '@OUTPUT@'], - install_dir: inc_dir, + install_dir: lib_inc_dir, install: bindings_lib, ) wl_proto_sources += custom_target('@0@ source'.format(proto), diff --git a/src/dbus/meson.build b/src/dbus/meson.build index 92c00cf176dd012f154c35d7b39a84f31381e439..2f6aa296a100f83aed6c1cea26a7dc881d22870b 100644 --- a/src/dbus/meson.build +++ b/src/dbus/meson.build @@ -5,7 +5,7 @@ generated_dbus_sources = [] generated_dbus_headers = [] dbus_prefix = 'PhoshDBus' -dbus_inc_dir = inc_dir / 'dbus' +dbus_inc_dir = lib_inc_dir / 'dbus' # # Protocols where Phosh is the DBus client: diff --git a/src/libphosh.h b/src/libphosh.h index 4c02b39efa390b211f847d72721d2147fca9af88..485a04b14e7ade78ec44308267a4ce577b909011 100644 --- a/src/libphosh.h +++ b/src/libphosh.h @@ -188,7 +188,6 @@ G_BEGIN_DECLS #include "settings/audio-device-row.h" #include "settings/audio-settings.h" -#include "wwan/phosh-wwan-backend.h" #include "wwan/phosh-wwan-ofono.h" #include "wwan/phosh-wwan-mm.h" #include "wwan/phosh-wwan-iface.h" diff --git a/src/meson.build b/src/meson.build index 9cc5e5ce6b46a4b4f846484cf6e9acab121c2d52..07fb7cced2ae565a41a2323d09bdb0e0964ac16e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -47,7 +47,7 @@ phosh_enums = gnome.mkenums_simple( 'phosh-enums', sources : phosh_enum_headers, install_header: bindings_lib, - install_dir: inc_dir, + install_dir: lib_inc_dir, ) phosh_settings_sources = files( @@ -435,6 +435,7 @@ phosh_lib = both_libraries('phosh', libphosh_sources, include_directories: phosh_lib_inc, dependencies: [phosh_tool_dep, phosh_deps], + soversion: soversion, install: bindings_lib, ) @@ -484,6 +485,7 @@ if bindings_lib filebase: 'libphosh-0', version : meson.project_version(), description: 'Private library for building external components', + requires: 'phosh-settings', url: 'https://world.pages.gitlab.gnome.org/Phosh/phosh/', ) @@ -493,27 +495,27 @@ if bindings_lib libphosh_tool_headers, libphosh_headers, ], - subdir : inc_subdir, + subdir : lib_inc_subdir, ) install_headers( phosh_monitor_headers, - subdir : inc_subdir / 'monitor', + subdir : lib_inc_subdir / 'monitor', ) install_headers( phosh_notifications_headers, - subdir : inc_subdir / 'notifications', + subdir : lib_inc_subdir / 'notifications', ) install_headers( phosh_settings_widgets_headers, - subdir : inc_subdir / 'settings', + subdir : lib_inc_subdir / 'settings', ) install_headers( phosh_wwan_headers, - subdir : inc_subdir / 'wwan', + subdir : lib_inc_subdir / 'wwan', ) endif