[glib/meson-for-merge] meson: gio, gobject: use files() for headers list



commit 33fb1bbb61bce38368acd5d503a16e46c511b674
Author: Tim-Philipp Müller <tim centricular com>
Date:   Sat Jan 28 16:59:45 2017 +0000

    meson: gio, gobject: use files() for headers list
    
    Since these variables are referenced from other directories
    such as the tests/ subdir as well.

 gio/meson.build     |   16 ++++++++--------
 gobject/meson.build |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index 79c477e..803b7ac 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -107,7 +107,7 @@ gnetworking_h = configure_file(input : 'gnetworking.h.in',
                                install_dir : join_paths(get_option('includedir'), 'glib-2.0/gio'),
                                configuration : gnetworking_h_conf)
 
-gdbus_headers = [
+gdbus_headers = files([
   'gdbusauthobserver.h',
   'gcredentials.h',
   'gdbusutils.h',
@@ -130,7 +130,7 @@ gdbus_headers = [
   'gdbusobjectmanagerclient.h',
   'gdbusobjectmanagerserver.h',
   'gtestdbus.h',
-]
+])
 
 gdbus_sources = [
   'gdbusutils.c',
@@ -190,11 +190,11 @@ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
                '--generate-c-code', '@OUTDIR@/gdbus-daemon-generated',
                '--c-namespace', '_G', '@INPUT@'])
 
-settings_headers = [
+settings_headers = files([
   'gsettingsbackend.h',
   'gsettingsschema.h',
   'gsettings.h',
-]
+])
 
 settings_sources = [
   'gvdb/gvdb-reader.c',
@@ -217,7 +217,7 @@ endif
 #settings_sources += [ 'gnextstepsettingsbackend.c' ]
 #endif
 
-application_headers = [
+application_headers = files([
   'gapplication.h',
   'gapplicationcommandline.h',
 
@@ -236,7 +236,7 @@ application_headers = [
   'gmenuexporter.h',
   'gdbusmenumodel.h',
   'gnotification.h',
-]
+])
 
 application_sources = [
   'gapplication.c',
@@ -517,7 +517,7 @@ gio-2.0.lib: libgio-2.0.la gio.def
   '$(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll 
-def:$(builddir)/gio.def -out:$@
 '''
 
-gio_headers = [
+gio_headers = files([
   'gappinfo.h',
   'gasyncinitable.h',
   'gasyncresult.h',
@@ -623,7 +623,7 @@ gio_headers = [
   'gzlibdecompressor.h',
   'glistmodel.h',
   'gliststore.h',
-]
+])
 
 gio_headers += application_headers
 gio_headers += settings_headers
diff --git a/gobject/meson.build b/gobject/meson.build
index ed7e654..043e15d 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -1,4 +1,4 @@
-gobject_install_headers = [
+gobject_install_headers = files([
   'gobject-autocleanups.h',
   'glib-types.h',
   'gbinding.h',
@@ -19,7 +19,7 @@ gobject_install_headers = [
   'gvaluecollector.h',
   'gvaluetypes.h',
   'gobjectnotifyqueue.c', # sic
-]
+])
 install_headers(gobject_install_headers, subdir : 'glib-2.0/gobject')
 
 gobject_c_sources = [


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