[gtk+/wip/baedert/meson: 87/87] meson: Don't forget to list the gtktypefuncs
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/meson: 87/87] meson: Don't forget to list the gtktypefuncs
- Date: Tue, 20 Sep 2016 15:43:57 +0000 (UTC)
commit b70d82b9fac26ad0b48d0a64831c3fa3d6f89943
Author: Timm Bäder <mail baedert org>
Date: Tue Sep 20 17:05:36 2016 +0200
meson: Don't forget to list the gtktypefuncs
gdk/meson.build | 3 +--
gtk/gentypefuncs.py | 1 +
gtk/meson.build | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 3152630..3d9e8fa 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/gentypefuncs.py b/gtk/gentypefuncs.py
index 5c1db6a..5b00f9a 100644
--- a/gtk/gentypefuncs.py
+++ b/gtk/gentypefuncs.py
@@ -31,6 +31,7 @@ for filename in in_files:
if debug: print ('Found ', func)
file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
+file_output = '\n'
funcs = sorted(funcs)
diff --git a/gtk/meson.build b/gtk/meson.build
index b197fc8..d85aaeb 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -815,6 +815,7 @@ endif
libgtk = shared_library('gtk',
gtk_sources,
+ typefuncs,
gtkmarshal_h,
c_args: [
'-DGTK_COMPILATION', '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
@@ -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]