diff options
| -rw-r--r-- | cut-n-paste/zoom-control/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 15 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build index 2c3320ac..7830f1d1 100644 --- a/cut-n-paste/zoom-control/meson.build +++ b/cut-n-paste/zoom-control/meson.build @@ -15,7 +15,7 @@ zoom_deps = [ ] libephyzoom = static_library( - 'libephyzoom', + 'ephyzoom', zoom_sources, include_directories: include_root, dependencies: zoom_deps, diff --git a/meson.build b/meson.build index 7a964e70..ed518e53 100644 --- a/meson.build +++ b/meson.build @@ -209,17 +209,20 @@ atril_view_header = [ # Compiler flags c_args = [ + '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), '-DDATADIR="@0@"'.format(join_paths(prefix, datadir)), '-DLIBDIR="@0@"'.format(join_paths(prefix, libdir)), '-DBINDIR="@0@"'.format(join_paths(prefix, bindir)), '-DEV_BACKENDSDIR="@0@"'.format(join_paths(prefix, libdir, meson.project_name(), binary_major_version, 'backends')), '-DATRILDATADIR="@0@"'.format(join_paths(prefix, datadir, meson.project_name())), + '-DMATELOCALEDIR="@0@"'.format(join_paths(prefix, datadir, 'locale')), '-Werror=implicit-function-declaration', '-DATRIL_COMPILATION', ] cpp_args = [ '-DATRIL_LOCALE_DIR="@0@"'.format(join_paths(prefix, datadir, 'locale')), + '-DMATELOCALEDIR="@0@"'.format(join_paths(prefix, datadir, 'locale')), '-DATRIL_COMPILATION', '-DHAVE_CONFIG_H', ] @@ -249,18 +252,6 @@ if get_option('epub') cpp_args += '-DENABLE_EPUB' endif -if not get_option('deprecated_warnings') - c_args += [ - '-Wno-deprecated-declarations', - '-Wno-deprecated', - '-Wno-declaration-after-statement', - ] - cpp_args += [ - '-Wno-deprecated-declarations', - '-Wno-deprecated', - ] -endif - # Add compiler arguments add_project_arguments(c_args, language: 'c') add_project_arguments(cpp_args, language: 'cpp') diff --git a/meson_options.txt b/meson_options.txt index eaa5b17d..0fe1c039 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -106,6 +106,6 @@ option('enable_debug', option('maintainer_mode', type: 'boolean', - value: true, + value: false, description: 'Enable maintainer mode (extra warnings for deprecated APIs)' ) |