[gtk+/wip/baedert/meson: 834/841] meson: Install libgtk and libgdk
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/meson: 834/841] meson: Install libgtk and libgdk
- Date: Thu, 3 Nov 2016 11:18:08 +0000 (UTC)
commit b0cc84617b10560681c090831cc7eae91ff07464
Author: Timm Bäder <mail baedert org>
Date: Sat Sep 24 10:18:26 2016 +0200
meson: Install libgtk and libgdk
gdk/meson.build | 1 +
gtk/meson.build | 4 ++--
tests/meson.build | 1 -
testsuite/gtk/meson.build | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 0f82745..965e041 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -369,6 +369,7 @@ libgdk = shared_library('gdk',
c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
include_directories: [confinc, xinc, wlinc],
dependencies: gdk_deps,
+ install: true
)
diff --git a/gtk/meson.build b/gtk/meson.build
index 79a93a1..6f5b87b 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -745,8 +745,7 @@ typefuncs = custom_target(
output : 'gtktypefuncs.c',
input : gdk_headers + gtk_public_h_sources + gtk_deprecated_type_headers + gtk_private_h_sources +
[gtktypebuiltins_h] + [gdkenum_h],
command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
- install: true,
- install_dir: '.'
+ install: false,
)
cdata = configuration_data()
@@ -837,6 +836,7 @@ libgtk = shared_library('gtk',
c_args: gtk_cargs,
include_directories: [ confinc, gdkinc, gtkinc ],
dependencies: [gtk_deps, libgdk_dep],
+ install: true
)
libgtk_dep = declare_dependency(
diff --git a/tests/meson.build b/tests/meson.build
index 2a33d7c..714a279 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,5 @@
test_popover = executable('testpopover', 'testpopover.c', dependencies: libgtk_dep)
-install_data('popover.ui', install_dir: meson.build_root())
test_cairo = executable('testcairo', 'testcairo.c', dependencies: libgtk_dep)
test_animated_resizing = executable('animated-resizing',
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 51986f2..a11db7b 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -17,7 +17,6 @@ test('gtk/bitmask test', test_bitmask)
test_builder = executable('builder', 'builder.c', dependencies: libgtk_dep)
test('gtk/builder test', test_builder)
-install_subdir('ui', install_dir: '.')
test_builderparser = executable(
'builderparser',
'builderparser.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]