diff --git a/daemon-gtk3/meson.build b/daemon-gtk3/meson.build index 167a17a09..bcd5b2383 100644 --- a/daemon-gtk3/meson.build +++ b/daemon-gtk3/meson.build @@ -7,14 +7,13 @@ gala_daemon_sources = files( 'BackgroundMenu.vala', ) -granite_dep_old = dependency('granite') +granite6_dep = dependency('granite') hdy_dep = dependency('libhandy-1') -gala_daemon_bin = executable( +executable( 'gala-daemon-gtk3', gala_daemon_sources, config_header, - dependencies: [gala_dep, gala_base_dep, granite_dep_old, hdy_dep], - include_directories: config_inc_dir, + dependencies: [gala_base_dep, gala_dep, granite6_dep, hdy_dep], install: true, ) diff --git a/daemon/meson.build b/daemon/meson.build index b8f6f3c66..f40466b58 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -7,12 +7,14 @@ gala_daemon_sources = files( 'WindowMenu.vala', ) -gala_daemon_bin = executable( +gtk4_dep = dependency('gtk4') +granite7_dep = dependency('granite-7') + +executable( 'gala-daemon', gala_daemon_sources, config_header, gala_resources, - dependencies: [granite_dep, gtk4_dep], - include_directories: config_inc_dir, - install: true, + dependencies: [gtk4_dep, granite7_dep], + install: true ) diff --git a/docs/meson.build b/docs/meson.build index 88f397262..94b0c9c1b 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,30 +1,22 @@ -valadoc = find_program('valadoc') - mutter_packages_command = [] foreach dep : mutter_dep mutter_packages_command += [ '--pkg', dep.name() ] endforeach basic_command = [ - valadoc, + find_program('valadoc'), '--force', '--verbose', '--package-name','gala', - '--package-version', '0.0.0', - '--driver', vala.version(), + '--package-version', meson.project_version(), mutter_packages_command, - '--pkg', 'atk-bridge-2.0', - '--pkg', 'gnome-desktop-3.0', '--pkg', 'gtk+-3.0', '--pkg', 'gee-0.8', '--pkg', 'gio-unix-2.0', '--pkg', 'gmodule-2.0', '--pkg', 'posix', - '--pkg', 'sqlite3', - '--pkg', 'libsystemd', - '--pkg', 'granite', vala_flags, - '--vapidir=' + join_paths(meson.build_root(), 'lib'), + '--vapidir=' + join_paths(meson.project_build_root(), 'lib'), '--vapidir=' + join_paths(meson.global_source_root(), 'vapi'), '--doclet=html', '--use-svg-images' @@ -47,7 +39,10 @@ all_doc_target = custom_target( command: [ basic_command, '--internal', - '--pkg', 'granite', + '--pkg', 'sqlite3', + '--pkg', 'atk-bridge-2.0', + '--pkg', 'gnome-desktop-3.0', + '--pkg', 'libsystemd', '--pkg', 'gnome-desktop-3.0', '--pkg', 'gmodule-2.0', '--pkg', 'wayland-server', diff --git a/lib/meson.build b/lib/meson.build index 5ef16c7f5..2d0b89cf6 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -47,7 +47,6 @@ gala_lib = shared_library( gala_lib_sources, gala_resources, dependencies: [gala_base_dep], - include_directories: config_inc_dir, install: true, install_dir: [true, join_paths(get_option('includedir'), 'gala'), true], install_rpath: mutter_typelib_dir, diff --git a/meson.build b/meson.build index d4a14000f..2fe21d65a 100644 --- a/meson.build +++ b/meson.build @@ -28,8 +28,6 @@ config_header = configure_file ( configuration: conf ) -config_inc_dir = include_directories('.') - add_project_arguments([ '--target-glib=2.44', '--hide-internal', @@ -56,7 +54,6 @@ add_project_arguments([ # Dependencies glib_version_required = '2.74.0' -gtk_version_required = '3.10.0' atk_bridge_dep = dependency('atk-bridge-2.0') glib_dep = dependency('glib-2.0', version: '>= @0@'.format(glib_version_required)) @@ -64,10 +61,8 @@ gobject_dep = dependency('gobject-2.0', version: '>= @0@'.format(glib_version_re gio_dep = dependency('gio-2.0', version: '>= @0@'.format(glib_version_required)) gio_unix_dep = dependency('gio-unix-2.0', version: '>= @0@'.format(glib_version_required)) gmodule_dep = dependency('gmodule-2.0') -gtk_dep = [dependency('gtk+-3.0', version: '>= @0@'.format(gtk_version_required)), dependency('gdk-x11-3.0')] -gtk4_dep = dependency('gtk4') +gtk3_dep = dependency('gtk+-3.0') gee_dep = dependency('gee-0.8') -granite_dep = dependency('granite-7') gnome_desktop_dep = dependency('gnome-desktop-3.0') m_dep = cc.find_library('m', required: false) posix_dep = vala.find_library('posix', required: false) @@ -154,7 +149,7 @@ endif add_project_arguments(vala_flags, language: 'vala') add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c') -gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep] +gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk3_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep] if get_option('systemd') gala_base_dep += systemd_dep diff --git a/plugins/pip/meson.build b/plugins/pip/meson.build index 198d1bbf9..f5e49d5d8 100644 --- a/plugins/pip/meson.build +++ b/plugins/pip/meson.build @@ -1,14 +1,13 @@ -gala_pip_sources = [ +gala_pip_sources = files( 'Main.vala', 'PopupWindow.vala', 'SelectionArea.vala' -] +) gala_pip_lib = shared_library( 'gala-pip', gala_pip_sources, dependencies: [gala_dep, gala_base_dep], - include_directories: config_inc_dir, install: true, install_dir: plugins_dir, install_rpath: mutter_typelib_dir, diff --git a/plugins/template/meson.build b/plugins/template/meson.build index 5c29763ae..288befe76 100644 --- a/plugins/template/meson.build +++ b/plugins/template/meson.build @@ -1,12 +1,11 @@ -gala_template_sources = [ - 'Main.vala', -] +gala_template_sources = files( + 'Main.vala' +) gala_template_lib = shared_library( 'gala-template', gala_template_sources, dependencies: [gala_dep, gala_base_dep], - include_directories: config_inc_dir, install: false, install_dir: plugins_dir, install_rpath: mutter_typelib_dir, diff --git a/src/meson.build b/src/meson.build index 95b37e428..724bff590 100644 --- a/src/meson.build +++ b/src/meson.build @@ -72,7 +72,6 @@ gala_bin = executable( gala_bin_sources, config_header, dependencies: [gala_dep, gala_base_dep, pantheon_desktop_shell_dep], - include_directories: config_inc_dir, install_rpath: mutter_typelib_dir, install: true, )