[glib: 2/3] meson: Add gobjectenumtypes.h to gioenumtypes_dep
- From: Sebastian Dröge <sdroege src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 2/3] meson: Add gobjectenumtypes.h to gioenumtypes_dep
- Date: Wed, 20 Feb 2019 21:15:10 +0000 (UTC)
commit 2d6c4b289a6c06253010d6fe015400d081563894
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Wed Feb 20 22:37:56 2019 +0530
meson: Add gobjectenumtypes.h to gioenumtypes_dep
Almost everything that needs gioenumtypes.h also needs
gobjectenumtypes.h. Fixes:
ccache cc @gio/win32/gio@win32@@giowin32@sta/gwin32filemonitor.c.obj.rsp
In file included from ../gio/win32/gwin32filemonitor.h:25:0,
from ../gio/win32/gwin32filemonitor.c:26:
../glib/glib-object.h:37:10: fatal error: gobject/gobjectenumtypes.h: No such file or directory
#include <gobject/gobjectenumtypes.h>
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
gio/meson.build | 2 +-
gio/win32/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index d7f4f3f31..8f989bfe9 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -754,7 +754,7 @@ gioenumtypes_c = custom_target('gioenumtypes_c',
'--template', files('gioenumtypes.c.template'),
'@INPUT@', gnetworking_h])
-gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h])
+gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, gobjectenumtypes_h])
# inotify
if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
diff --git a/gio/win32/meson.build b/gio/win32/meson.build
index c1841cb64..f0fc307ba 100644
--- a/gio/win32/meson.build
+++ b/gio/win32/meson.build
@@ -8,8 +8,8 @@ giowin32_sources = [
]
giowin32_lib = static_library('giowin32',
- sources : [giowin32_sources, gioenumtypes_h],
+ sources : [giowin32_sources],
include_directories : [configinc, glibinc, gioinc, gmoduleinc],
- dependencies : [libintl],
+ dependencies : [libintl, gioenumtypes_dep],
pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]