AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

meson: Remove G_LOG_USE_STRUCTURED from target C flags

Browse Source 
The G_LOG_USE_STRUCTURED symbol is defined in the project flags, so we
don't need to add it again in the per-target flags.
This commit is contained in:
Emmanuele Bassi 2017-05-03 16:22:52 +01:00
parent fee3f9afa1
commit 0dad501d16
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/broadway/meson.build
View File

@ -38,7 +38,6 @@ libgdk_broadway = static_library('gdk-broadway',
c_args: [ c_args: [
'-DGDK_COMPILATION', '-DGDK_COMPILATION',
'-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_DOMAIN="Gdk"',
'-DG_LOG_USE_STRUCTURED=1',
] + common_cflags, ] + common_cflags,
link_args: common_ldflags, link_args: common_ldflags,
dependencies: [gdk_deps, gdk_broadway_deps]) dependencies: [gdk_deps, gdk_broadway_deps])
@ -63,6 +62,6 @@ executable('gtk4-broadwayd',
clienthtml_h, broadwayjs_h, clienthtml_h, broadwayjs_h,
'broadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c', 'broadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c',
include_directories: [confinc, gdkinc], include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_USE_STRUCTURED=1', ], c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
dependencies : [broadwayd_syslib, gdk_deps], dependencies : [broadwayd_syslib, gdk_deps],
install : true) install : true)

1
gdk/meson.build
View File

@ -205,7 +205,6 @@ libgdk = static_library('gdk',
c_args: [ c_args: [
'-DGDK_COMPILATION', '-DGDK_COMPILATION',
'-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_DOMAIN="Gdk"',
'-DG_LOG_USE_STRUCTURED=1',
] + common_cflags, ] + common_cflags,
link_whole: gdk_backends, link_whole: gdk_backends,
link_args: common_ldflags) link_args: common_ldflags)

1
gdk/wayland/meson.build
View File

@ -98,7 +98,6 @@ libgdk_wayland = static_library('gdk-wayland',
c_args: [ c_args: [
'-DGDK_COMPILATION', '-DGDK_COMPILATION',
'-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_DOMAIN="Gdk"',
'-DG_LOG_USE_STRUCTURED=1',
] + common_cflags, ] + common_cflags,
link_args: common_ldflags, link_args: common_ldflags,
dependencies: [ gdk_deps, gdk_wayland_deps, ]) dependencies: [ gdk_deps, gdk_wayland_deps, ])

1
gdk/x11/meson.build
View File

@ -73,7 +73,6 @@ libgdk_x11 = static_library('gdk-x11',
c_args: [ c_args: [
'-DGDK_COMPILATION', '-DGDK_COMPILATION',
'-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_DOMAIN="Gdk"',
'-DG_LOG_USE_STRUCTURED=1',
] + common_cflags, ] + common_cflags,
link_args: common_ldflags, link_args: common_ldflags,
dependencies: [ gdk_deps, gdk_x11_deps, ]) dependencies: [ gdk_deps, gdk_x11_deps, ])

1
gtk/meson.build
View File

@ -771,7 +771,6 @@ gtkversion = configure_file(input: 'gtkversion.h.in',
gtk_cargs = [ gtk_cargs = [
'-DGTK_COMPILATION', '-DGTK_COMPILATION',
'-DG_LOG_DOMAIN="Gtk"', '-DG_LOG_DOMAIN="Gtk"',
'-DG_LOG_USE_STRUCTURED=1',
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED', '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
'-DGTK_BINARY_VERSION="@0@"'.format(gtk_binary_version), '-DGTK_BINARY_VERSION="@0@"'.format(gtk_binary_version),
'-DGTK_HOST="@0@"'.format(host_machine.system()), '-DGTK_HOST="@0@"'.format(host_machine.system()),