From a0d2d1f44b421b35fbbcdc677baf44d2fc5e4b03 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 12 Mar 2018 10:02:24 +0000 Subject: [PATCH] Use the same arguments for print backends All the print backend shared modules should use the same C preprocessor symbols. --- modules/printbackends/meson.build | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build index 76b5c3789e..388f03d59f 100644 --- a/modules/printbackends/meson.build +++ b/modules/printbackends/meson.build @@ -94,17 +94,19 @@ else colord_dep = [] endif +printbackends_args = [ + '-DGTK_COMPILATION', + '-DGTK_DISABLE_DEPRECATION_WARNINGS', + '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', +] + if print_backends.contains('cups') shared_module('printbackend-cups', 'gtkprintbackendcups.c', 'gtkprintercups.c', 'gtkcupsutils.c', 'gtkcupssecretsutils.c', - c_args: [ - '-DGTK_COMPILATION', - '-DGTK_DISABLE_DEPRECATION_WARNINGS', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], + c_args: printbackends_args, dependencies: [libgtk_dep, libcups, colord_dep], install_dir: printbackends_install_dir, install : true) @@ -115,10 +117,7 @@ if print_backends.contains('cloudprint') 'gtkprintbackendcloudprint.c', 'gtkprintercloudprint.c', 'gtkcloudprintaccount.c', - c_args: [ - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - '-DGTK_DISABLE_DEPRECATION_WARNINGS', - ], + c_args: printbackends_args, dependencies: [ libgtk_dep, rest_dep, json_glib_dep ], install_dir: printbackends_install_dir, install : true) @@ -127,11 +126,7 @@ endif if print_backends.contains('file') shared_module('printbackend-file', 'gtkprintbackendfile.c', - c_args: [ - '-DGTK_COMPILATION', - '-DGTK_DISABLE_DEPRECATION_WARNINGS', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], + c_args: printbackends_args, dependencies: libgtk_dep, install_dir: printbackends_install_dir, install : true) @@ -140,12 +135,8 @@ endif if print_backends.contains('lpr') shared_module('printbackend-lpr', 'gtkprintbackendlpr.c', - c_args: [ - '-DGTK_COMPILATION', - '-DGTK_DISABLE_DEPRECATION_WARNINGS', - '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', - ], + c_args: printbackends_args, dependencies: libgtk_dep, install_dir: printbackends_install_dir, install : true) -endif \ No newline at end of file +endif