diff options
| -rw-r--r-- | cut-n-paste/toolbar-editor/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | shell/meson.build | 79 | ||||
| -rw-r--r-- | subprojects/mate-submodules.wrap | 6 |
4 files changed, 68 insertions, 26 deletions
diff --git a/cut-n-paste/toolbar-editor/meson.build b/cut-n-paste/toolbar-editor/meson.build index 759b4daa..16dde70a 100644 --- a/cut-n-paste/toolbar-editor/meson.build +++ b/cut-n-paste/toolbar-editor/meson.build @@ -88,11 +88,11 @@ libtoolbareditor = static_library('toolbareditor', c_args: [ '-DCURSOR_DIR="' + join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) + '"', ], - include_directories: include_directories('.'), + include_directories: include_directories('.', '..'), dependencies: [shell_core_deps, xml] ) libtoolbareditor_dep = declare_dependency( link_with: libtoolbareditor, - include_directories: include_directories('.') + include_directories: include_directories('.', '..') ) diff --git a/meson.build b/meson.build index 4156d47a..5e66eaf3 100644 --- a/meson.build +++ b/meson.build @@ -67,6 +67,7 @@ zlib = dependency('zlib') libsecret = dependency('libsecret-1', version: '>= 0.5', required: get_option('keyring')) gtk_unix_print = dependency('gtk+-unix-print-3.0', version: '>= ' + gtk_version, required: get_option('gtk_unix_print')) mate_desktop = dependency('mate-desktop-2.0') +egg = dependency('libegg') # Backend configuration enabled_backend_names = [] @@ -220,7 +221,8 @@ c_args = [ '-DMATELOCALEDIR="@0@"'.format(join_paths(prefix, datadir, 'locale')), '-Werror=implicit-function-declaration', '-DATRIL_COMPILATION', - '-DPACKAGE_URL="https://mate-desktop.org"' + '-DPACKAGE_URL="https://mate-desktop.org"', + '-include', 'config.h', ] cpp_args = [ @@ -284,6 +286,7 @@ endif subdir('cut-n-paste/toolbar-editor') subdir('cut-n-paste/zoom-control') +subdir('properties') subdir('shell') subdir('po') diff --git a/shell/meson.build b/shell/meson.build index c3b93894..021b04f8 100644 --- a/shell/meson.build +++ b/shell/meson.build @@ -1,3 +1,23 @@ +# Define include directories +include_dirs = include_directories( + '.', # Current directory + '..', # Parent directory + '../cut-n-paste/zoom-control', + '../cut-n-paste/toolbar-editor', + '../libdocument', + '../libview', + '../libmisc', + '../properties' +) + +# Define preprocessor definitions +c_args = [ + '-DATRILDATADIR="' + join_paths(get_option('prefix'), get_option('datadir'), 'atril') + '"', + '-DMATEDATADIR="' + get_option('datadir') + '"', + '-DLIBEXECDIR="' + get_option('libexecdir') + '"', + '-DATRIL_COMPILATION' +] + shell_sources = [ 'eggfindbar.c', 'eggfindbar.h', @@ -13,12 +33,18 @@ shell_sources = [ 'ev-file-monitor.c', 'ev-history.c', 'ev-history.h', + 'ev-loading-message.h', + 'ev-loading-message.c', 'ev-keyring.h', 'ev-keyring.c', 'ev-message-area.c', 'ev-message-area.h', 'ev-metadata.c', 'ev-metadata.h', + 'ev-navigation-action.h', + 'ev-navigation-action.c', + 'ev-navigation-action-widget.h', + 'ev-navigation-action-widget.c', 'ev-password-view.h', 'ev-password-view.c', 'ev-progress-message-area.h', @@ -72,9 +98,34 @@ atril_deps = [ gtk, libsecret, math, - mate_desktop + mate_desktop, + egg, + libtoolbareditor_dep, + libevproperties_dep +] + +libshell_deps = [ + atril_deps, + libview_dep, + libmisc_dep, + mate_submodules_dep, + libephyzoom_dep, ] +libshell = static_library( + 'shell', + shell_sources, + dependencies: libshell_deps, + include_directories: include_dirs, +) + +libshell_dep = declare_dependency( + link_whole: libshell, # Need the whole lib for gresource lookup + dependencies: libshell_deps, + include_directories: include_dirs, +) + +# Conditional compilation for DBus if get_option('enable_dbus') dbus_generated = gnome.gdbus_codegen( 'ev-gdbus-generated', @@ -105,35 +156,17 @@ if get_option('enable_dbus') atrild_sources, include_directories: include_dirs, dependencies: atril_deps, + c_args: c_args, install: true, install_dir: libexecdir, ) endif -libshell_deps = [ - atril_deps, - libview_dep, - libmisc_dep, - mate_submodules_dep, - libephyzoom_dep, -] - -libshell = static_library( - 'shell', - shell_sources, - dependencies: libshell_deps, - include_directories: include_dirs, -) - -libshell_dep = declare_dependency( - link_whole: libshell, # Need the whole lib for gresource lookup - dependencies: libshell_deps, - include_directories: include_dirs, -) - atril = executable( 'atril', 'main.c', - dependencies: libshell_dep, + dependencies: [libshell_dep] + atril_deps, + include_directories: include_dirs, + c_args: c_args, install: true, ) diff --git a/subprojects/mate-submodules.wrap b/subprojects/mate-submodules.wrap index 78466059..23ec215a 100644 --- a/subprojects/mate-submodules.wrap +++ b/subprojects/mate-submodules.wrap @@ -4,3 +4,9 @@ url=https://github.com/mate-desktop/mate-submodules.git push-url=ssh://[email protected]:mate-desktop/mate-submodules.git revision=master depth=1 + +[provide] +libegg = libegg_dep + + + |