[gtk+/wip/meson: 132/215] meson: Require gtkmarshal_h before we build gtk



commit 40cede1e0bc822c25ae7740b2a44316a13899e96
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 2bfc5da..a31f657 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -816,6 +816,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"',
@@ -836,6 +837,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]