luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: gio, gobject: use files() for headers list

Browse Source 
Since these variables are referenced from other directories
such as the tests/ subdir as well.
This commit is contained in:
Tim-Philipp Müller 2017-01-28 16:59:45 +00:00 committed by Matthias Clasen
parent 89ee284d2b
commit 33fb1bbb61
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/meson.build
View File

@ -107,7 +107,7 @@ gnetworking_h = configure_file(input : 'gnetworking.h.in',
install_dir : join_paths(get_option('includedir'), 'glib-2.0/gio'), install_dir : join_paths(get_option('includedir'), 'glib-2.0/gio'),
configuration : gnetworking_h_conf) configuration : gnetworking_h_conf)
gdbus_headers = [ gdbus_headers = files([
'gdbusauthobserver.h', 'gdbusauthobserver.h',
'gcredentials.h', 'gcredentials.h',
'gdbusutils.h', 'gdbusutils.h',
@ -130,7 +130,7 @@ gdbus_headers = [
'gdbusobjectmanagerclient.h', 'gdbusobjectmanagerclient.h',
'gdbusobjectmanagerserver.h', 'gdbusobjectmanagerserver.h',
'gtestdbus.h', 'gtestdbus.h',
] ])
gdbus_sources = [ gdbus_sources = [
'gdbusutils.c', 'gdbusutils.c',
@ -190,11 +190,11 @@ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
'--generate-c-code', '@OUTDIR@/gdbus-daemon-generated', '--generate-c-code', '@OUTDIR@/gdbus-daemon-generated',
'--c-namespace', '_G', '@INPUT@']) '--c-namespace', '_G', '@INPUT@'])
settings_headers = [ settings_headers = files([
'gsettingsbackend.h', 'gsettingsbackend.h',
'gsettingsschema.h', 'gsettingsschema.h',
'gsettings.h', 'gsettings.h',
] ])
settings_sources = [ settings_sources = [
'gvdb/gvdb-reader.c', 'gvdb/gvdb-reader.c',
@ -217,7 +217,7 @@ endif
#settings_sources += [ 'gnextstepsettingsbackend.c' ] #settings_sources += [ 'gnextstepsettingsbackend.c' ]
#endif #endif
application_headers = [ application_headers = files([
'gapplication.h', 'gapplication.h',
'gapplicationcommandline.h', 'gapplicationcommandline.h',
@ -236,7 +236,7 @@ application_headers = [
'gmenuexporter.h', 'gmenuexporter.h',
'gdbusmenumodel.h', 'gdbusmenumodel.h',
'gnotification.h', 'gnotification.h',
] ])
application_sources = [ application_sources = [
'gapplication.c', '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:$@ '$(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', 'gappinfo.h',
'gasyncinitable.h', 'gasyncinitable.h',
'gasyncresult.h', 'gasyncresult.h',
@ -623,7 +623,7 @@ gio_headers = [
'gzlibdecompressor.h', 'gzlibdecompressor.h',
'glistmodel.h', 'glistmodel.h',
'gliststore.h', 'gliststore.h',
] ])
gio_headers += application_headers gio_headers += application_headers
gio_headers += settings_headers gio_headers += settings_headers

4
gobject/meson.build
View File

@ -1,4 +1,4 @@
gobject_install_headers = [ gobject_install_headers = files([
'gobject-autocleanups.h', 'gobject-autocleanups.h',
'glib-types.h', 'glib-types.h',
'gbinding.h', 'gbinding.h',
@ -19,7 +19,7 @@ gobject_install_headers = [
'gvaluecollector.h', 'gvaluecollector.h',
'gvaluetypes.h', 'gvaluetypes.h',
'gobjectnotifyqueue.c', # sic 'gobjectnotifyqueue.c', # sic
] ])
install_headers(gobject_install_headers, subdir : 'glib-2.0/gobject') install_headers(gobject_install_headers, subdir : 'glib-2.0/gobject')
gobject_c_sources = [ gobject_c_sources = [