[gtk+/wip/meson] meson: gdk: fix static library names
- From: Tim-Philipp Müller <tpm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson] meson: gdk: fix static library names
- Date: Thu, 30 Mar 2017 23:17:47 +0000 (UTC)
commit 970416daafa23c8832803b3c75ea5d7aeda57c3b
Author: Tim-Philipp Müller <tim centricular com>
Date: Fri Mar 31 00:15:08 2017 +0100
meson: gdk: fix static library names
Fix double lib prefix in filenames (liblibgdk-xyz.a)
gdk/broadway/meson.build | 2 +-
gdk/mir/meson.build | 2 +-
gdk/quartz/meson.build | 2 +-
gdk/wayland/meson.build | 2 +-
gdk/win32/meson.build | 2 +-
gdk/x11/meson.build | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index 0e5b1c4..b80e134 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -32,7 +32,7 @@ gdk_broadway_public_headers = [
gdk_broadway_deps = [shmlib]
-libgdk_broadway = static_library('libgdk-broadway',
+libgdk_broadway = static_library('gdk-broadway',
gdk_broadway_sources, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'],
diff --git a/gdk/mir/meson.build b/gdk/mir/meson.build
index 5c11162..9f45db4 100644
--- a/gdk/mir/meson.build
+++ b/gdk/mir/meson.build
@@ -24,7 +24,7 @@ gdk_mir_deps = [
libcontent_hub_glib_dep,
]
-libgdk_mir = static_library('libgdk-mir',
+libgdk_mir = static_library('gdk-mir',
gdk_mir_sources, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'],
diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build
index 6ee35b3..0b01964 100644
--- a/gdk/quartz/meson.build
+++ b/gdk/quartz/meson.build
@@ -39,7 +39,7 @@ install_headers('gdkquartz.h', subdir: 'gtk-4.0/gdk/')
gdk_quartz_deps = [ # FIXME
]
-libgdk_quartz = static_library('libgdk-quartz',
+libgdk_quartz = static_library('gdk-quartz',
gdk_quartz_sources, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'],
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index b0d20ec..f5e894c 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -82,7 +82,7 @@ foreach p : proto_sources
command: [genprotocols, wayland_scanner, '@INPUT@', '@OUTPUT@', 'code'])
endforeach
-libgdk_wayland = static_library('libgdk-wayland',
+libgdk_wayland = static_library('gdk-wayland',
gdk_wayland_sources, gdk_wayland_gen_headers, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'],
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 452983a..c99f609 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -43,7 +43,7 @@ install_headers('gdkwin32.h', subdir: 'gtk-4.0/gdk/')
gdk_win32_deps = [ # FIXME
]
-libgdk_win32 = static_library('libgdk-win32',
+libgdk_win32 = static_library('gdk-win32',
gdk_win32_sources, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'],
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 467e002..6a8bd33 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -69,7 +69,7 @@ gdk_x11_deps = [
xinerama_dep,
]
-libgdk_x11 = static_library('libgdk-x11',
+libgdk_x11 = static_library('gdk-x11',
gdk_x11_sources, gdkconfig, gdkenum_h,
include_directories: [confinc, gdkinc],
c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]