From 97985a664ef901d27078fdfe09216adf8c931bb0 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Mon, 12 Aug 2019 17:05:55 +1200 Subject: [PATCH] Remove unused GNOMELOCALEDIR defines --- panels/applications/meson.build | 2 -- panels/background/meson.build | 1 - panels/bluetooth/meson.build | 2 -- panels/color/meson.build | 1 - panels/datetime/meson.build | 3 +-- panels/display/meson.build | 3 +-- panels/info/meson.build | 3 +-- panels/keyboard/meson.build | 2 -- panels/mouse/meson.build | 2 -- panels/network/meson.build | 2 -- panels/notifications/meson.build | 2 -- panels/online-accounts/meson.build | 2 -- panels/power/meson.build | 2 -- panels/printers/meson.build | 2 -- panels/privacy/meson.build | 2 -- panels/search/meson.build | 3 +-- panels/thunderbolt/meson.build | 1 - panels/universal-access/meson.build | 2 -- search-provider/meson.build | 2 -- 19 files changed, 4 insertions(+), 35 deletions(-) diff --git a/panels/applications/meson.build b/panels/applications/meson.build index 49796a322..f0b1041c3 100644 --- a/panels/applications/meson.build +++ b/panels/applications/meson.build @@ -38,8 +38,6 @@ sources += gnome.compile_resources( export : true ) -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources : sources, diff --git a/panels/background/meson.build b/panels/background/meson.build index 4058ba808..f5a493fd7 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build @@ -98,7 +98,6 @@ deps = common_deps + [ ] cflags += [ - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), '-DDATADIR="@0@"'.format(control_center_datadir), '-DGNOME_DESKTOP_USE_UNSTABLE_API' ] diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build index fad3f79d5..c3fce7467 100644 --- a/panels/bluetooth/meson.build +++ b/panels/bluetooth/meson.build @@ -31,8 +31,6 @@ sources += gnome.compile_resources( deps = common_deps + [gnome_bluetooth_dep] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/panels/color/meson.build b/panels/color/meson.build index 2a9b8e903..d688d7a06 100644 --- a/panels/color/meson.build +++ b/panels/color/meson.build @@ -48,7 +48,6 @@ deps = common_deps + [ ] cflags += [ - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), '-DBINDIR="@0@"'.format(control_center_bindir) ] diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build index 2ed0da71e..29f8eb2f1 100644 --- a/panels/datetime/meson.build +++ b/panels/datetime/meson.build @@ -179,8 +179,7 @@ deps = common_deps + [ ] cflags += [ - '-DGNOMECC_DATA_DIR="@0@"'.format(control_center_pkgdatadir), - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) + '-DGNOMECC_DATA_DIR="@0@"'.format(control_center_pkgdatadir) ] datetime_panel_lib = static_library( diff --git a/panels/display/meson.build b/panels/display/meson.build index f2b6f09c4..12f35cc25 100644 --- a/panels/display/meson.build +++ b/panels/display/meson.build @@ -51,8 +51,7 @@ deps = common_deps + [ ] cflags += [ - '-DDATADIR="@0@"'.format(control_center_datadir), - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) + '-DDATADIR="@0@"'.format(control_center_datadir) ] panels_libs += static_library( diff --git a/panels/info/meson.build b/panels/info/meson.build index 911abbe9f..e07babfd5 100644 --- a/panels/info/meson.build +++ b/panels/info/meson.build @@ -29,8 +29,7 @@ endforeach cflags += [ '-DBINDIR="@0@"'.format(control_center_bindir), '-DDATADIR="@0@"'.format(control_center_datadir), - '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir), - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) + '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir) ] sources = files( diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build index 0a0b8356a..b60dcc295 100644 --- a/panels/keyboard/meson.build +++ b/panels/keyboard/meson.build @@ -84,8 +84,6 @@ deps = common_deps + [ x11_dep ] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build index 2f4b6b866..cf79fc784 100644 --- a/panels/mouse/meson.build +++ b/panels/mouse/meson.build @@ -46,8 +46,6 @@ deps = common_deps + [ xi_dep ] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname + '-properties', sources: sources, diff --git a/panels/network/meson.build b/panels/network/meson.build index ec9df3263..576fdd3c3 100644 --- a/panels/network/meson.build +++ b/panels/network/meson.build @@ -70,8 +70,6 @@ sources += gnome.compile_resources( export: true ) -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - network_panel_lib = static_library( cappletname, sources: sources, diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build index bbec5dfea..df702614a 100644 --- a/panels/notifications/meson.build +++ b/panels/notifications/meson.build @@ -35,8 +35,6 @@ sources += gnome.compile_resources( export: true ) -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build index 1f899e881..82f1d569a 100644 --- a/panels/online-accounts/meson.build +++ b/panels/online-accounts/meson.build @@ -34,8 +34,6 @@ deps = common_deps + [ dependency('goa-backend-1.0', version: goa_req_version) ] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/panels/power/meson.build b/panels/power/meson.build index 736222613..737d86817 100644 --- a/panels/power/meson.build +++ b/panels/power/meson.build @@ -34,8 +34,6 @@ deps = common_deps + [ upower_glib_dep ] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - if host_is_linux deps += network_manager_deps endif diff --git a/panels/printers/meson.build b/panels/printers/meson.build index e3d1e8414..85044d161 100644 --- a/panels/printers/meson.build +++ b/panels/printers/meson.build @@ -64,8 +64,6 @@ deps = common_deps + [ dependency('smbclient') ] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - printers_panel_lib = static_library( cappletname, sources: sources, diff --git a/panels/privacy/meson.build b/panels/privacy/meson.build index 12b436e48..28fd3eccd 100644 --- a/panels/privacy/meson.build +++ b/panels/privacy/meson.build @@ -29,8 +29,6 @@ sources += gnome.compile_resources( export: true ) -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/panels/search/meson.build b/panels/search/meson.build index f3731b581..1b5c4b280 100644 --- a/panels/search/meson.build +++ b/panels/search/meson.build @@ -37,8 +37,7 @@ sources += gnome.compile_resources( ) cflags += [ - '-DDATADIR="@0@"'.format(control_center_datadir), - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) + '-DDATADIR="@0@"'.format(control_center_datadir) ] panels_libs += static_library( diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build index 233ca1902..2b1a03a42 100644 --- a/panels/thunderbolt/meson.build +++ b/panels/thunderbolt/meson.build @@ -62,7 +62,6 @@ deps = common_deps + [ ] cflags += [ - '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir), '-DBINDIR="@0@"'.format(control_center_bindir) ] diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build index 79615a55b..fbc25813e 100644 --- a/panels/universal-access/meson.build +++ b/panels/universal-access/meson.build @@ -42,8 +42,6 @@ sources += gnome.compile_resources( deps = common_deps + [m_dep] -cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - panels_libs += static_library( cappletname, sources: sources, diff --git a/search-provider/meson.build b/search-provider/meson.build index 294464c5d..1a3467250 100644 --- a/search-provider/meson.build +++ b/search-provider/meson.build @@ -30,8 +30,6 @@ sources += gnome.gdbus_codegen( namespace : 'Cc' ) -cflags = '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir) - libs = [ libpanel_loader, libshell