[gtk+/wip/meson: 19/73] meson: Require gtkmarshal_h before we build gtk
- From: Tim-Philipp Müller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 19/73] meson: Require gtkmarshal_h before we build gtk
- Date: Wed, 22 Mar 2017 09:33:40 +0000 (UTC)
commit 3e2ccf81ef49873d26ea787ca8f2277ce4fcfe20
Author: Timm Bäder <mail baedert org>
Date: Tue Sep 20 17:02:12 2016 +0200
meson: Require gtkmarshal_h before we build gtk
gdk/meson.build | 3 +--
gtk/meson.build | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index ac2ba34..5b26d8f 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -365,8 +365,7 @@ endif
libgdk = shared_library('gdk',
- gdk_sources,
- gdkenum_h,
+ sources: [gdk_sources, gdkconfig, gdkenum_h],
c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
include_directories: [confinc, xinc, wlinc],
dependencies: gdk_deps,
diff --git a/gtk/meson.build b/gtk/meson.build
index 8ae3865..81653bd 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -815,6 +815,7 @@ endif
libgtk = shared_library('gtk',
gtk_sources,
+ gtkmarshal_h,
c_args: [
'-DGTK_COMPILATION', '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
'-DGTK_BINARY_VERSION="3"', '-DGTK_HOST="bob"',
@@ -835,6 +836,6 @@ libgtk_dep = declare_dependency(
gtktypebuiltins_h,
],
dependencies: gtk_deps,
- link_with: libgtk,
+ link_with: [libgtk, libgdk],
include_directories: [confinc, gtkinc]
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]