[gtk/wip/nirbheek/gtk-3-24-meson] fixup! meson: Sync build files with master and update to 3.24



commit 7bc464df46f8068251562f981ccbcbb7d7177213
Author: Nirbheek Chauhan <nirbheek centricular com>
Date:   Tue Nov 20 16:09:14 2018 +0530

    fixup! meson: Sync build files with master and update to 3.24

 gdk/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 4d94314bb1..01b84788aa 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -246,7 +246,7 @@ if gdk_backends.length() == 0
 endif
 
 # FIXME: might have to add '-xobjective-c' to c_args for quartz backend?
-libgdk = static_library('gdk',
+libgdk = shared_library('gdk-3',
   sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
   dependencies: gdk_deps,
   include_directories: [confinc, gdkx11_inc, wlinc],
@@ -257,10 +257,8 @@ libgdk = static_library('gdk',
   link_whole: gdk_backends,
   link_args: common_ldflags)
 
-# We don't have link_with: to internal static libs here on purpose, just
-# list the dependencies and generated headers and such, for use in the
-# "public" libgtk_dep used by internal executables.
 libgdk_dep = declare_dependency(
+  link_with: libgdk,
   sources: ['gdk.h', gdkconfig, gdkenum_h],
   include_directories: [confinc, gdkx11_inc, wlinc],
   dependencies: gdk_deps)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]