[gtk+/wip/meson: 74/135] meson: gtk: install headers
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 74/135] meson: gtk: install headers
- Date: Fri, 28 Apr 2017 22:19:37 +0000 (UTC)
commit 4c354afaf754e0a22a9eeb6052005bead8441036
Author: Tim-Philipp Müller <tim centricular com>
Date: Mon Mar 20 16:24:12 2017 +0000
meson: gtk: install headers
gtk/a11y/meson.build | 1 +
gtk/deprecated/meson.build | 2 ++
gtk/meson.build | 13 ++++---------
3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/gtk/a11y/meson.build b/gtk/a11y/meson.build
index a3b789f..7526343 100644
--- a/gtk/a11y/meson.build
+++ b/gtk/a11y/meson.build
@@ -107,3 +107,4 @@ a11y_headers = files([
'gtkwidgetaccessible.h',
'gtkwindowaccessible.h',
])
+install_headers(a11y_headers, subdir : 'gtk-4.0/gtk/a11y')
diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index 2e08105..7e7916b 100644
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -1,3 +1,5 @@
gtk_deprecated_sources = files([])
gtk_deprecated_headers = files([])
+
+install_headers(gtk_deprecated_headers, subdir: 'gtk-4.0/gtk/deprecated/')
diff --git a/gtk/meson.build b/gtk/meson.build
index e6caa1e..70c7440 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -595,6 +595,8 @@ gtk_public_headers = files([
'gtkwindowgroup.h',
])
+install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/')
+
gtk_unix_sources = files([
'gtkcustompaperunixdialog.c',
'gtkpagesetupunixdialog.c',
@@ -668,7 +670,7 @@ gtktypebuiltins_h = custom_target(
input : gtk_public_headers + gtk_deprecated_headers,
command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.h.template',
'@OUTPUT@', '@INPUT@'],
install: true,
- install_dir: 'include/gtk-4.0/gtk/' # XXX ???
+ install_dir: 'include/gtk-4.0/gtk/'
)
gtktypebuiltins_c = custom_target(
@@ -716,7 +718,7 @@ gtkversion = configure_file(
input : 'gtkversion.h.in',
output : 'gtkversion.h',
configuration: cdata,
- install_dir: 'include/gtk-4.0/gtk/' # XXX ???
+ install_dir: 'include/gtk-4.0/gtk/'
)
gtk_cargs = [
@@ -787,13 +789,6 @@ endif
gnome.compile_schemas()
-
-# Install necessary headers
-
-# install_headers(gtk_public_headers, subdir: 'gtk-3.0/gtk/')
-# install_headers(gtk_deprecated_headers, subdir: 'gtk-3.0/gtk/deprecated/')
-# install_headers(a11y_headers, subdir: 'gtk-3.0/gtk/a11y/')
-
libgtk = shared_library('gtk',
sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
c_args: gtk_cargs,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]