GNOME.org
 

[gtk+/wip/baedert/meson: 840/841] meson: Sort input files by name

commit fc12424e92698c295bda173ba74840146a79b396
Author: Timm Bäder <mail baedert org>
Date:   Mon Sep 26 12:51:17 2016 +0200

    meson: Sort input files by name

 gdk/meson.build            |  139 ++++++++++++++++---------
 gdk/wayland/meson.build    |    4 -
 gtk/a11y/meson.build       |   63 +++++++++++-
 gtk/deprecated/meson.build |   49 ++++++++-
 gtk/inspector/meson.build  |    4 +-
 gtk/meson.build            |  248 +++++++++++++++++++-------------------------
 testsuite/a11y/meson.build |   11 ++
 testsuite/meson.build      |    3 +
 8 files changed, 316 insertions(+), 205 deletions(-)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 965e041..bf8c955 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -1,4 +1,3 @@
-deprecated_gdk_sources = ['deprecated/gdkcolor.c']
 gdk_sources = files([
   'gdk-private.c',
   'gdk.c',
@@ -9,60 +8,60 @@ gdk_sources = files([
   'gdkdevice.c',
   'gdkdevicemanager.c',
   'gdkdevicepad.c',
+  'gdkdevicetool.c',
   'gdkdisplay.c',
   'gdkdisplaymanager.c',
   'gdkdnd.c',
+  'gdkdrawingcontext.c',
   'gdkevents.c',
+  'gdkframeclock.c',
+  'gdkframeclockidle.c',
   'gdkframetimings.c',
   'gdkgl.c',
   'gdkglcontext.c',
   'gdkglobals.c',
   'gdkkeys.c',
   'gdkkeyuni.c',
+  'gdkmonitor.c',
   'gdkoffscreenwindow.c',
-  'gdkframeclock.c',
-  'gdkframeclockidle.c',
   'gdkpango.c',
   'gdkpixbuf-drawable.c',
   'gdkproperty.c',
   'gdkrectangle.c',
   'gdkrgba.c',
   'gdkscreen.c',
+  'gdkseat.c',
+  'gdkseatdefault.c',
   'gdkselection.c',
   'gdkvisual.c',
   'gdkwindow.c',
   'gdkwindowimpl.c',
-  'gdkseat.c',
-  'gdkseatdefault.c',
-  'gdkdevicetool.c',
-  'gdkdrawingcontext.c',
-  'gdkmonitor.c'
 ])
 
 gdk_public_h_sources = files([
-  'gdk.h',
   'gdk-autocleanup.h',
+  'gdk.h',
   'gdkapplaunchcontext.h',
   'gdkcairo.h',
   'gdkcursor.h',
   'gdkdevice.h',
-  'gdkdevicetool.h',
   'gdkdevicemanager.h',
   'gdkdevicepad.h',
+  'gdkdevicetool.h',
   'gdkdisplay.h',
   'gdkdisplaymanager.h',
   'gdkdnd.h',
   'gdkdrawingcontext.h',
   'gdkevents.h',
+  'gdkframeclock.h',
   'gdkframetimings.h',
   'gdkglcontext.h',
   'gdkkeys.h',
-  'gdkkeysyms.h',
   'gdkkeysyms-compat.h',
+  'gdkkeysyms.h',
   'gdkmain.h',
   'gdkmonitor.h',
   'gdkpango.h',
-  'gdkframeclock.h',
   'gdkpixbuf.h',
   'gdkprivate.h',
   'gdkproperty.h',
@@ -79,14 +78,14 @@ gdk_public_h_sources = files([
 ])
 
 gdk_private_h_sources = files([
-  'gdkseatdefaultprivate.h',
   'gdkdevicetoolprivate.h',
   'gdkdrawingcontextprivate.h',
   'gdkmonitorprivate.h',
   'gdkprivate.h',
+  'gdkseatdefaultprivate.h',
 ])
 
-gdk_x_sources = [
+gdk_x_sources = files([
   'x11/MwmUtil.h',
   'x11/gdkapplaunchcontext-x11.c',
   'x11/gdkasync.c',
@@ -97,9 +96,9 @@ gdk_x_sources = [
   'x11/gdkdevicemanager-core-x11.c',
   'x11/gdkdevicemanager-x11.c',
   'x11/gdkdevicemanager-xi2.c',
-  'x11/gdkdisplaymanager-x11.c',
   'x11/gdkdisplay-x11.c',
   'x11/gdkdisplay-x11.h',
+  'x11/gdkdisplaymanager-x11.c',
   'x11/gdkdnd-x11.c',
   'x11/gdkeventsource.c',
   'x11/gdkeventsource.h',
@@ -110,6 +109,8 @@ gdk_x_sources = [
   'x11/gdkglcontext-x11.h',
   'x11/gdkkeys-x11.c',
   'x11/gdkmain-x11.c',
+  'x11/gdkmonitor-x11.c',
+  'x11/gdkmonitor-x11.h',
   'x11/gdkproperty-x11.c',
   'x11/gdkscreen-x11.c',
   'x11/gdkscreen-x11.h',
@@ -118,20 +119,42 @@ gdk_x_sources = [
   'x11/gdkvisual-x11.c',
   'x11/gdkwindow-x11.c',
   'x11/gdkwindow-x11.h',
+  'x11/gdkx.h',
+  'x11/gdkx11monitor.h',
   'x11/gdkxftdefaults.c',
   'x11/gdkxid.c',
-  'x11/gdkx.h',
-  'x11/xsettings-client.h',
   'x11/xsettings-client.c',
-  'x11/gdkmonitor-x11.c',
-  'x11/gdkmonitor-x11.h',
-  'x11/gdkx11monitor.h'
-]
+  'x11/xsettings-client.h',
+])
 
-gdk_x_private_sources = [
-  'x11/gdkprivate-x11.h',
+gdk_x_private_sources = files([
   'x11/gdkdevicemanagerprivate-core.h',
-]
+  'x11/gdkprivate-x11.h',
+])
+
+gdk_x_public_headers = files([
+  'x11/gdkx-autocleanups.h',
+  'x11/gdkx11applaunchcontext.h',
+  'x11/gdkx11cursor.h',
+  'x11/gdkx11device-core.h',
+  'x11/gdkx11device-xi2.h',
+  'x11/gdkx11device.h',
+  'x11/gdkx11devicemanager-core.h',
+  'x11/gdkx11devicemanager-xi2.h',
+  'x11/gdkx11devicemanager.h',
+  'x11/gdkx11display.h',
+  'x11/gdkx11displaymanager.h',
+  'x11/gdkx11dnd.h',
+  'x11/gdkx11glcontext.h',
+  'x11/gdkx11keys.h',
+  'x11/gdkx11monitor.h',
+  'x11/gdkx11property.h',
+  'x11/gdkx11screen.h',
+  'x11/gdkx11selection.h',
+  'x11/gdkx11utils.h',
+  'x11/gdkx11visual.h',
+  'x11/gdkx11window.h',
+])
 
 gdk_wayland_sources = files([
   'wayland/gdkapplaunchcontext-wayland.c',
@@ -149,10 +172,10 @@ gdk_wayland_sources = files([
   'wayland/gdkscreen-wayland.c',
   'wayland/gdkseat-wayland.h',
   'wayland/gdkselection-wayland.c',
+  'wayland/gdkwayland.h',
   'wayland/gdkwaylanddevice.h',
   'wayland/gdkwaylanddisplay.h',
   'wayland/gdkwaylandglcontext.h',
-  'wayland/gdkwayland.h',
   'wayland/gdkwaylandmonitor.h',
   'wayland/gdkwaylandselection.h',
   'wayland/gdkwaylandwindow.h',
@@ -160,6 +183,14 @@ gdk_wayland_sources = files([
   'wayland/wm-button-layout-translation.c',
 ])
 
+gdk_wayland_public_headers = files([
+  'wayland/gdkwaylanddevice.h',
+  'wayland/gdkwaylanddisplay.h',
+  'wayland/gdkwaylandglcontext.h',
+  'wayland/gdkwaylandselection.h',
+  'wayland/gdkwaylandwindow.h'
+])
+
 gdk_wayland_private_sources = files([
   'wayland/gdkprivate-wayland.h',
 ])
@@ -167,36 +198,36 @@ gdk_wayland_private_sources = files([
 
 
 gdk_broadway_sources = files([
-  'broadway/gdkdisplay-broadway.c',
-  'broadway/gdkdisplay-broadway.h',
-  'broadway/gdkscreen-broadway.c',
-  'broadway/gdkscreen-broadway.h',
+  'broadway/broadway-buffer.c',
+  'broadway/broadway-buffer.h',
   'broadway/broadway-output.c',
   'broadway/broadway-output.h',
-  'broadway/broadway-server.h',
   'broadway/broadway-server.c',
+  'broadway/broadway-server.h',
+  'broadway/broadwayd.c',
   'broadway/gdkbroadway-server.c',
   'broadway/gdkcursor-broadway.c',
-  'broadway/gdkvisual-broadway.c',
-  'broadway/gdkselection-broadway.c',
-  'broadway/gdkwindow-broadway.c',
-  'broadway/gdkwindow-broadway.h',
-  'broadway/gdkmonitor-broadway.c',
-  'broadway/gdkmonitor-broadway.h',
-  'broadway/gdkkeys-broadway.c',
-  'broadway/gdkglobals-broadway.c',
-  'broadway/gdkeventsource.c',
-  'broadway/gdkeventsource.h',
-  'broadway/gdkdnd-broadway.c',
-  'broadway/broadwayd.c',
-  'broadway/gdkdevicemanager-broadway.c',
-  'broadway/gdkdevicemanager-broadway.h',
   'broadway/gdkdevice-broadway.c',
   'broadway/gdkdevice-broadway.h',
-  'broadway/broadway-buffer.c',
-  'broadway/broadway-buffer.h',
+  'broadway/gdkdevicemanager-broadway.c',
+  'broadway/gdkdevicemanager-broadway.h',
+  'broadway/gdkdisplay-broadway.c',
+  'broadway/gdkdisplay-broadway.h',
+  'broadway/gdkdnd-broadway.c',
+  'broadway/gdkeventsource.c',
+  'broadway/gdkeventsource.h',
+  'broadway/gdkglobals-broadway.c',
+  'broadway/gdkkeys-broadway.c',
+  'broadway/gdkmonitor-broadway.c',
+  'broadway/gdkmonitor-broadway.h',
+  'broadway/gdkproperty-broadway.c',
+  'broadway/gdkscreen-broadway.c',
+  'broadway/gdkscreen-broadway.h',
+  'broadway/gdkselection-broadway.c',
   'broadway/gdktestutils-broadway.c',
-  'broadway/gdkproperty-broadway.c'
+  'broadway/gdkvisual-broadway.c',
+  'broadway/gdkwindow-broadway.c',
+  'broadway/gdkwindow-broadway.h',
 ])
 
 gdk_broadway_private_sources = files([
@@ -238,6 +269,7 @@ gdkresources = gnome.compile_resources(
 )
 
 
+deprecated_gdk_sources = ['deprecated/gdkcolor.c']
 deprecated_h_sources = files(['deprecated/gdkcolor.h'])
 
 gdk_headers = gdk_public_h_sources + deprecated_h_sources + gdk_private_h_sources
@@ -282,13 +314,15 @@ if broadway_enabled cdata.set('GDK_WINDOWING_BROADWAY', '') endif
 gdkconfig = configure_file(
   input  : 'gdkconfig.h.meson',
   output : 'gdkconfig.h',
-  configuration : cdata
+  configuration : cdata,
+  install_dir: 'include/gtk-3.0/gdk/' # XXX ???
 )
 
 gdkversionmacros = configure_file(
   input  : 'gdkversionmacros.h.in',
   output : 'gdkversionmacros.h',
-  configuration: cdata
+  configuration: cdata,
+  install_dir: 'include/gtk-3.0/gdk/' # XXX ???
 )
 
 xinc = include_directories('x11')
@@ -335,6 +369,8 @@ if x11_enabled
     gdk_x_sources,
     gdk_x_private_sources
   ]
+
+  install_headers(gdk_x_public_headers, subdir: 'gtk-3.0/gdk/x11/')
 endif
 
 if wayland_enabled
@@ -351,6 +387,8 @@ if wayland_enabled
     gdk_wayland_sources,
     gdk_wayland_private_sources
   ]
+
+  install_headers(gdk_wayland_public_headers, subdir: 'gtk-3.0/gdk/wayland/')
 endif
 
 if broadway_enabled
@@ -364,6 +402,9 @@ if broadway_enabled
 endif
 
 
+install_headers(gdk_public_h_sources, subdir: 'gtk-3.0/gdk/')
+install_headers(deprecated_h_sources, subdir: 'gtk-3.0/gdk/deprecated/')
+
 libgdk = shared_library('gdk',
   sources: [gdk_sources, gdkconfig, gdkenum_h],
   c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 6783ecf..34cc6bb 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -1,5 +1,3 @@
-
-
 if wayland_enabled
   runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols')
   if runcmd.returncode() == 0
@@ -95,8 +93,6 @@ if wayland_enabled
     command: [genprotocols, wayland_scanner,'@INPUT@', '@OUTPUT@', 'code']
   )
 
-
-
   gdk_sources += [
     gtk_shell_c,
     gtk_shell_h,
diff --git a/gtk/a11y/meson.build b/gtk/a11y/meson.build
index c53c22a..e8023b7 100644
--- a/gtk/a11y/meson.build
+++ b/gtk/a11y/meson.build
@@ -1,4 +1,4 @@
-a11y_sources = files(
+a11y_sources = files([
   'gtkaccessibility.c',
   'gtkaccessibilitymisc.c',
   'gtkaccessibilityutil.c',
@@ -28,8 +28,8 @@ a11y_sources = files(
   'gtklockbuttonaccessible.c',
   'gtkmenuaccessible.c',
   'gtkmenubuttonaccessible.c',
-  'gtkmenushellaccessible.c',
   'gtkmenuitemaccessible.c',
+  'gtkmenushellaccessible.c',
   'gtknotebookaccessible.c',
   'gtknotebookpageaccessible.c',
   'gtkpanedaccessible.c',
@@ -44,6 +44,7 @@ a11y_sources = files(
   'gtkscrolledwindowaccessible.c',
   'gtkspinbuttonaccessible.c',
   'gtkspinneraccessible.c',
+  'gtkstackaccessible.c',
   'gtkstatusbaraccessible.c',
   'gtkswitchaccessible.c',
   'gtktextcellaccessible.c',
@@ -53,5 +54,59 @@ a11y_sources = files(
   'gtktreeviewaccessible.c',
   'gtkwidgetaccessible.c',
   'gtkwindowaccessible.c',
-  'gtkstackaccessible.c'
-  )
+])
+
+a11y_headers = files([
+  'gtk-a11y-autocleanups.h',
+  'gtkarrowaccessible.h',
+  'gtkbooleancellaccessible.h',
+  'gtkbuttonaccessible.h',
+  'gtkcellaccessible.h',
+  'gtkcellaccessibleparent.h',
+  'gtkcheckmenuitemaccessible.h',
+  'gtkcomboboxaccessible.h',
+  'gtkcontaineraccessible.h',
+  'gtkcontainercellaccessible.h',
+  'gtkentryaccessible.h',
+  'gtkexpanderaccessible.h',
+  'gtkflowboxaccessible.h',
+  'gtkflowboxchildaccessible.h',
+  'gtkframeaccessible.h',
+  'gtkiconviewaccessible.h',
+  'gtkimageaccessible.h',
+  'gtkimagecellaccessible.h',
+  'gtklabelaccessible.h',
+  'gtklevelbaraccessible.h',
+  'gtklinkbuttonaccessible.h',
+  'gtklistboxaccessible.h',
+  'gtklistboxrowaccessible.h',
+  'gtklockbuttonaccessible.h',
+  'gtkmenuaccessible.h',
+  'gtkmenubuttonaccessible.h',
+  'gtkmenuitemaccessible.h',
+  'gtkmenushellaccessible.h',
+  'gtknotebookaccessible.h',
+  'gtknotebookpageaccessible.h',
+  'gtkpanedaccessible.h',
+  'gtkpopoveraccessible.h',
+  'gtkprogressbaraccessible.h',
+  'gtkradiobuttonaccessible.h',
+  'gtkradiomenuitemaccessible.h',
+  'gtkrangeaccessible.h',
+  'gtkrenderercellaccessible.h',
+  'gtkscaleaccessible.h',
+  'gtkscalebuttonaccessible.h',
+  'gtkscrolledwindowaccessible.h',
+  'gtkspinbuttonaccessible.h',
+  'gtkspinneraccessible.h',
+  'gtkstackaccessible.h',
+  'gtkstatusbaraccessible.h',
+  'gtkswitchaccessible.h',
+  'gtktextcellaccessible.h',
+  'gtktextviewaccessible.h',
+  'gtktogglebuttonaccessible.h',
+  'gtktoplevelaccessible.h',
+  'gtktreeviewaccessible.h',
+  'gtkwidgetaccessible.h',
+  'gtkwindowaccessible.h',
+])
diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index c2cf475..85f5a5b 100644
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -1,7 +1,7 @@
-gtk_deprecated_c_sources = files(
-  'gtkactivatable.c',
+gtk_deprecated_sources = files(
   'gtkaction.c',
   'gtkactiongroup.c',
+  'gtkactivatable.c',
   'gtkalignment.c',
   'gtkarrow.c',
   'gtkcolorsel.c',
@@ -35,8 +35,51 @@ gtk_deprecated_c_sources = files(
   'gtkuimanager.c',
   'gtkvbbox.c',
   'gtkvbox.c',
+  'gtkvpaned.c',
   'gtkvscale.c',
   'gtkvscrollbar.c',
   'gtkvseparator.c',
-  'gtkvpaned.c',
 )
+
+gtk_deprecated_headers = files([
+  'gtkaction.h',
+  'gtkactiongroup.h',
+  'gtkactivatable.h',
+  'gtkalignment.h',
+  'gtkarrow.h',
+  'gtkcolorsel.h',
+  'gtkcolorseldialog.h',
+  'gtkfontsel.h',
+  'gtkgradient.h',
+  'gtkhandlebox.h',
+  'gtkhbbox.h',
+  'gtkhbox.h',
+  'gtkhpaned.h',
+  'gtkhscale.h',
+  'gtkhscrollbar.h',
+  'gtkhseparator.h',
+  'gtkhsv.h',
+  'gtkiconfactory.h',
+  'gtkimagemenuitem.h',
+  'gtkmisc.h',
+  'gtknumerableicon.h',
+  'gtkradioaction.h',
+  'gtkrc.h',
+  'gtkrecentaction.h',
+  'gtkstatusicon.h',
+  'gtkstock.h',
+  'gtkstyle.h',
+  'gtkstyleproperties.h',
+  'gtksymboliccolor.h',
+  'gtktable.h',
+  'gtktearoffmenuitem.h',
+  'gtkthemingengine.h',
+  'gtktoggleaction.h',
+  'gtkuimanager.h',
+  'gtkvbbox.h',
+  'gtkvbox.h',
+  'gtkvpaned.h',
+  'gtkvscale.h',
+  'gtkvscrollbar.h',
+  'gtkvseparator.h',
+])
diff --git a/gtk/inspector/meson.build b/gtk/inspector/meson.build
index a119a08..7ca24ae 100644
--- a/gtk/inspector/meson.build
+++ b/gtk/inspector/meson.build
@@ -8,6 +8,7 @@ inspector_sources = files(
   'general.c',
   'gestures.c',
   'graphdata.c',
+  'gtkstackcombo.c',
   'gtktreemodelcssnode.c',
   'init.c',
   'inspect-button.c',
@@ -23,9 +24,8 @@ inspector_sources = files(
   'signals-list.c',
   'size-groups.c',
   'statistics.c',
+  'strv-editor.c',
   'treewalk.c',
   'visual.c',
   'window.c',
-  'strv-editor.c',
-  'gtkstackcombo.c'
 )
diff --git a/gtk/meson.build b/gtk/meson.build
index 394a108..878435c 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -3,31 +3,28 @@ subdir('a11y')
 subdir('inspector')
 
 gtk_sources = files([
-  'gtkactionmuxer.c',
-  'gtkactionobserver.c',
-  'gtkactionobservable.c',
-  'gtkactionable.c',
-  'gtkquery.c',
-  'gtksearchbar.c',
-  'gtksearchentry.c',
-  'gtksearchengine.c',
-  'gtksearchenginesimple.c',
-  'gtksearchenginemodel.c',
+  'fallback-c89.c',
   'fnmatch.c',
+  'gdkpixbufutils.c',
   'gtkaboutdialog.c',
   'gtkaccelgroup.c',
   'gtkaccellabel.c',
   'gtkaccelmap.c',
   'gtkaccessible.c',
+  'gtkactionable.c',
   'gtkactionbar.c',
   'gtkactionhelper.c',
+  'gtkactionmuxer.c',
+  'gtkactionobservable.c',
+  'gtkactionobserver.c',
   'gtkadjustment.c',
   'gtkallocatedbitmask.c',
   'gtkappchooser.c',
-  'gtkappchooserwidget.c',
   'gtkappchooserbutton.c',
   'gtkappchooserdialog.c',
+  'gtkappchooserwidget.c',
   'gtkapplication.c',
+  'gtkapplicationaccels.c',
   'gtkapplicationimpl.c',
   'gtkapplicationwindow.c',
   'gtkaspectframe.c',
@@ -38,17 +35,14 @@ gtk_sources = files([
   'gtkbookmarksmanager.c',
   'gtkborder.c',
   'gtkbox.c',
+  'gtkboxgadget.c',
   'gtkbuildable.c',
+  'gtkbuilder-menus.c',
   'gtkbuilder.c',
-  'gtkicon.c',
-  'gtkshortcutswindow.c',
-  'gtkshortcutssection.c',
   'gtkbuilderparser.c',
-  'gtkbuilder-menus.c',
+  'gtkbuiltinicon.c',
   'gtkbutton.c',
   'gtkcairoblur.c',
-  'gtkcssnode.c',
-  'gtkcsscalcvalue.c',
   'gtkcalendar.c',
   'gtkcellarea.c',
   'gtkcellareabox.c',
@@ -70,8 +64,8 @@ gtk_sources = files([
   'gtkcheckmenuitem.c',
   'gtkcolorbutton.c',
   'gtkcolorchooser.c',
-  'gtkcolorchooserwidget.c',
   'gtkcolorchooserdialog.c',
+  'gtkcolorchooserwidget.c',
   'gtkcoloreditor.c',
   'gtkcolorplane.c',
   'gtkcolorscale.c',
@@ -79,39 +73,36 @@ gtk_sources = files([
   'gtkcolorutils.c',
   'gtkcombobox.c',
   'gtkcomboboxtext.c',
+  'gtkcomposetable.c',
   'gtkcontainer.c',
-  'gtkcssanimation.c',
-  'gtkcssgadget.c',
-  'gtkcsscustomgadget.c',
-  'gtkboxgadget.c',
-  'gtkimagedefinition.c',
-  'gtkprogresstracker.c',
-  'gtkcssimageradial.c',
-  'gtkcssimagerecolor.c',
-  'gtkcssimagefallback.c',
-  'gtkbuiltinicon.c',
-  'gtkcssstylechange.c',
-  'gtkcsspalettevalue.c',
   'gtkcssanimatedstyle.c',
+  'gtkcssanimation.c',
   'gtkcssarrayvalue.c',
   'gtkcssbgsizevalue.c',
   'gtkcssbordervalue.c',
+  'gtkcsscalcvalue.c',
   'gtkcsscolorvalue.c',
   'gtkcsscornervalue.c',
+  'gtkcsscustomgadget.c',
   'gtkcsscustomproperty.c',
+  'gtkcssdimensionvalue.c',
   'gtkcsseasevalue.c',
-  'gtkcssenumvalue.c',
   'gtkcssenginevalue.c',
+  'gtkcssenumvalue.c',
+  'gtkcssgadget.c',
   'gtkcssiconthemevalue.c',
   'gtkcssimage.c',
   'gtkcssimagebuiltin.c',
   'gtkcssimagecrossfade.c',
+  'gtkcssimagefallback.c',
   'gtkcssimagegradient.c',
   'gtkcssimageicontheme.c',
   'gtkcssimagelinear.c',
+  'gtkcssimageradial.c',
+  'gtkcssimagerecolor.c',
+  'gtkcssimagescaled.c',
   'gtkcssimagesurface.c',
   'gtkcssimageurl.c',
-  'gtkcssimagescaled.c',
   'gtkcssimagevalue.c',
   'gtkcssimagewin32.c',
   'gtkcssinheritvalue.c',
@@ -120,8 +111,11 @@ gtk_sources = files([
   'gtkcsslookup.c',
   'gtkcssmatcher.c',
   'gtkcssnode.c',
+  'gtkcssnode.c',
   'gtkcssnodedeclaration.c',
+  'gtkcssnodestylecache.c',
   'gtkcssnumbervalue.c',
+  'gtkcsspalettevalue.c',
   'gtkcssparser.c',
   'gtkcsspathnode.c',
   'gtkcsspositionvalue.c',
@@ -130,16 +124,14 @@ gtk_sources = files([
   'gtkcssrgbavalue.c',
   'gtkcsssection.c',
   'gtkcssselector.c',
-  'gtkcssstringvalue.c',
-  'gtkcssstyle.c',
   'gtkcssshadowsvalue.c',
   'gtkcssshadowvalue.c',
   'gtkcssshorthandproperty.c',
-  'gtkshortcutlabel.c',
-  'gtkfilechoosernativeportal.c',
-  'gtkdragsource.c',
   'gtkcssshorthandpropertyimpl.c',
   'gtkcssstaticstyle.c',
+  'gtkcssstringvalue.c',
+  'gtkcssstyle.c',
+  'gtkcssstylechange.c',
   'gtkcssstylefuncs.c',
   'gtkcssstyleproperty.c',
   'gtkcssstylepropertyimpl.c',
@@ -147,21 +139,15 @@ gtk_sources = files([
   'gtkcsstransientnode.c',
   'gtkcsstransition.c',
   'gtkcsstypedvalue.c',
-  'gtkcssunsetvalue.c',
   'gtkcsstypes.c',
+  'gtkcssunsetvalue.c',
   'gtkcssvalue.c',
   'gtkcsswidgetnode.c',
-  'gtkcssnodestylecache.c',
-  'gtkapplicationaccels.c',
-  'gtkcssdimensionvalue.c',
-  'gtkshortcutsgroup.c',
-  'gtkshortcutsshortcut.c',
-  'gtkfilechoosernative.c',
-  'gtknativedialog.c',
+  'gtkcsswin32sizevalue.c',
   'gtkdialog.c',
+  'gtkdragdest.c',
+  'gtkdragsource.c',
   'gtkdrawingarea.c',
-  'gtkutils.c',
-  'gtktooltipwindow.c',
   'gtkeditable.c',
   'gtkentry.c',
   'gtkentrybuffer.c',
@@ -174,6 +160,8 @@ gtk_sources = files([
   'gtkfilechooserdialog.c',
   'gtkfilechooserembed.c',
   'gtkfilechooserentry.c',
+  'gtkfilechoosernative.c',
+  'gtkfilechoosernativeportal.c',
   'gtkfilechooserutils.c',
   'gtkfilechooserwidget.c',
   'gtkfilefilter.c',
@@ -184,16 +172,9 @@ gtk_sources = files([
   'gtkfontbutton.c',
   'gtkfontchooser.c',
   'gtkfontchooserdialog.c',
-  'gtkcsswin32sizevalue.c',
   'gtkfontchooserutils.c',
-  'gtkwin32theme.c',
-  'gtkwin32draw.c',
-  'gtkcomposetable.c',
-  'gdkpixbufutils.c',
   'gtkfontchooserwidget.c',
   'gtkframe.c',
-  'gtkprintoperation-portal.c',
-  'gtkgladecatalog.c',
   'gtkgesture.c',
   'gtkgesturedrag.c',
   'gtkgesturelongpress.c',
@@ -203,17 +184,19 @@ gtk_sources = files([
   'gtkgesturesingle.c',
   'gtkgestureswipe.c',
   'gtkgesturezoom.c',
+  'gtkgladecatalog.c',
   'gtkglarea.c',
   'gtkgrid.c',
   'gtkheaderbar.c',
-  'gtkdragdest.c',
   'gtkhsla.c',
+  'gtkicon.c',
   'gtkiconcache.c',
   'gtkiconcachevalidator.c',
   'gtkiconhelper.c',
   'gtkicontheme.c',
   'gtkiconview.c',
   'gtkimage.c',
+  'gtkimagedefinition.c',
   'gtkimcontext.c',
   'gtkimcontextsimple.c',
   'gtkimmodule.c',
@@ -229,24 +212,25 @@ gtk_sources = files([
   'gtklistbox.c',
   'gtkliststore.c',
   'gtklockbutton.c',
-  'gtkmain.c',
   'gtkmagnifier.c',
+  'gtkmain.c',
   'gtkmenu.c',
   'gtkmenubar.c',
   'gtkmenubutton.c',
   'gtkmenuitem.c',
   'gtkmenusectionbox.c',
   'gtkmenushell.c',
+  'gtkmenutoolbutton.c',
   'gtkmenutracker.c',
   'gtkmenutrackeritem.c',
-  'gtkmenutoolbutton.c',
   'gtkmessagedialog.c',
   'gtkmnemonichash.c',
-  'gtkmodelmenuitem.c',
   'gtkmodelbutton.c',
+  'gtkmodelmenuitem.c',
   'gtkmodifierstyle.c',
   'gtkmodules.c',
   'gtkmountoperation.c',
+  'gtknativedialog.c',
   'gtknotebook.c',
   'gtkoffscreenwindow.c',
   'gtkorientable.c',
@@ -257,30 +241,33 @@ gtk_sources = files([
   'gtkpango.c',
   'gtkpapersize.c',
   'gtkpathbar.c',
+  'gtkpixelcache.c',
   'gtkplacessidebar.c',
   'gtkplacesview.c',
   'gtkplacesviewrow.c',
+  'gtkpopover.c',
+  'gtkpopovermenu.c',
   'gtkprintcontext.c',
+  'gtkprintoperation-portal.c',
   'gtkprintoperation.c',
   'gtkprintoperationpreview.c',
   'gtkprintsettings.c',
   'gtkprintutils.c',
   'gtkprivate.c',
   'gtkprogressbar.c',
-  'gtkpixelcache.c',
-  'gtkpopover.c',
-  'gtkpopovermenu.c',
+  'gtkprogresstracker.c',
+  'gtkquery.c',
   'gtkradiobutton.c',
   'gtkradiomenuitem.c',
   'gtkradiotoolbutton.c',
   'gtkrange.c',
   'gtkrbtree.c',
+  'gtkrecentchooser.c',
   'gtkrecentchooserdefault.c',
   'gtkrecentchooserdialog.c',
   'gtkrecentchoosermenu.c',
-  'gtkrecentchooserwidget.c',
   'gtkrecentchooserutils.c',
-  'gtkrecentchooser.c',
+  'gtkrecentchooserwidget.c',
   'gtkrecentfilter.c',
   'gtkrecentmanager.c',
   'gtkrender.c',
@@ -294,20 +281,30 @@ gtk_sources = files([
   'gtkscrollable.c',
   'gtkscrollbar.c',
   'gtkscrolledwindow.c',
+  'gtksearchbar.c',
+  'gtksearchengine.c',
+  'gtksearchenginemodel.c',
+  'gtksearchenginesimple.c',
+  'gtksearchentry.c',
   'gtkselection.c',
   'gtkseparator.c',
   'gtkseparatormenuitem.c',
   'gtkseparatortoolitem.c',
   'gtksettings.c',
+  'gtkshortcutlabel.c',
+  'gtkshortcutsgroup.c',
+  'gtkshortcutssection.c',
+  'gtkshortcutsshortcut.c',
+  'gtkshortcutswindow.c',
+  'gtkshow.c',
   'gtksidebarrow.c',
   'gtksizegroup.c',
   'gtksizerequest.c',
   'gtksizerequestcache.c',
-  'gtkshow.c',
-  'gtkstacksidebar.c',
   'gtkspinbutton.c',
   'gtkspinner.c',
   'gtkstack.c',
+  'gtkstacksidebar.c',
   'gtkstackswitcher.c',
   'gtkstatusbar.c',
   'gtkstyleanimation.c',
@@ -344,6 +341,7 @@ gtk_sources = files([
   'gtktoolpalette.c',
   'gtktoolshell.c',
   'gtktooltip.c',
+  'gtktooltipwindow.c',
   'gtktrashmonitor.c',
   'gtktreedatalist.c',
   'gtktreednd.c',
@@ -356,14 +354,16 @@ gtk_sources = files([
   'gtktreestore.c',
   'gtktreeview.c',
   'gtktreeviewcolumn.c',
-  'gtkvolumebutton.c',
+  'gtkutils.c',
   'gtkviewport.c',
+  'gtkvolumebutton.c',
   'gtkwidget.c',
   'gtkwidgetpath.c',
+  'gtkwin32draw.c',
+  'gtkwin32theme.c',
+  'gtkwin32theme.c',
   'gtkwindow.c',
   'gtkwindowgroup.c',
-  'gtkwin32theme.c',
-  'fallback-c89.c'
 ])
 
 gtk_private_type_headers = files([
@@ -371,17 +371,15 @@ gtk_private_type_headers = files([
   'gtktexthandleprivate.h',
 ])
 
-gtk_private_h_sources = gtk_private_type_headers + files([
-  'gtkrecentchooserutils.h',
+gtk_private_headers = gtk_private_type_headers + files([
   'gtkrbtree.h',
+  'gtkrecentchooserutils.h',
 ])
 
-gtk_public_h_sources = files([
-  'gtk.h',
-  'gtk-autocleanups.h',
-  'gtkx.h',
-  'gtkx-autocleanups.h',
+gtk_public_headers = files([
   'gtk-a11y.h',
+  'gtk-autocleanups.h',
+  'gtk.h',
   'gtkaboutdialog.h',
   'gtkaccelgroup.h',
   'gtkaccellabel.h',
@@ -403,13 +401,13 @@ gtk_public_h_sources = files([
   'gtkbindings.h',
   'gtkborder.h',
   'gtkbox.h',
-  'gtkbuilder.h',
   'gtkbuildable.h',
+  'gtkbuilder.h',
   'gtkbutton.h',
   'gtkcalendar.h',
   'gtkcellarea.h',
-  'gtkcellareacontext.h',
   'gtkcellareabox.h',
+  'gtkcellareacontext.h',
   'gtkcelleditable.h',
   'gtkcelllayout.h',
   'gtkcellrenderer.h',
@@ -427,8 +425,8 @@ gtk_public_h_sources = files([
   'gtkclipboard.h',
   'gtkcolorbutton.h',
   'gtkcolorchooser.h',
-  'gtkcolorchooserwidget.h',
   'gtkcolorchooserdialog.h',
+  'gtkcolorchooserwidget.h',
   'gtkcolorutils.h',
   'gtkcombobox.h',
   'gtkcomboboxtext.h',
@@ -550,13 +548,13 @@ gtk_public_h_sources = files([
   'gtkshortcutsshortcut.h',
   'gtkshortcutswindow.h',
   'gtkshow.h',
-  'gtkstacksidebar.h',
   'gtksizegroup.h',
   'gtksizerequest.h',
   'gtksocket.h',
   'gtkspinbutton.h',
   'gtkspinner.h',
   'gtkstack.h',
+  'gtkstacksidebar.h',
   'gtkstackswitcher.h',
   'gtkstatusbar.h',
   'gtkstylecontext.h',
@@ -569,6 +567,7 @@ gtk_public_h_sources = files([
   'gtktextchild.h',
   'gtktextdisplay.h',
   'gtktextiter.h',
+  'gtktextlayout.h',
   'gtktextmark.h',
   'gtktexttag.h',
   'gtktexttagtable.h',
@@ -598,54 +597,14 @@ gtk_public_h_sources = files([
   'gtkwidgetpath.h',
   'gtkwindow.h',
   'gtkwindowgroup.h',
-])
-
-gtk_deprecated_type_headers = files([
-  'deprecated/gtkactivatable.h',
-  'deprecated/gtkaction.h',
-  'deprecated/gtkactiongroup.h',
-  'deprecated/gtkalignment.h',
-  'deprecated/gtkarrow.h',
-  'deprecated/gtkcolorsel.h',
-  'deprecated/gtkcolorseldialog.h',
-  'deprecated/gtkfontsel.h',
-  'deprecated/gtkgradient.h',
-  'deprecated/gtkhandlebox.h',
-  'deprecated/gtkhbbox.h',
-  'deprecated/gtkhbox.h',
-  'deprecated/gtkhpaned.h',
-  'deprecated/gtkhscale.h',
-  'deprecated/gtkhscrollbar.h',
-  'deprecated/gtkhseparator.h',
-  'deprecated/gtkhsv.h',
-  'deprecated/gtkiconfactory.h',
-  'deprecated/gtkimagemenuitem.h',
-  'deprecated/gtkmisc.h',
-  'deprecated/gtknumerableicon.h',
-  'deprecated/gtkradioaction.h',
-  'deprecated/gtkrc.h',
-  'deprecated/gtkrecentaction.h',
-  'deprecated/gtkstatusicon.h',
-  'deprecated/gtkstock.h',
-  'deprecated/gtkstyle.h',
-  'deprecated/gtkstyleproperties.h',
-  'deprecated/gtksymboliccolor.h',
-  'deprecated/gtktable.h',
-  'deprecated/gtktearoffmenuitem.h',
-  'deprecated/gtkthemingengine.h',
-  'deprecated/gtktoggleaction.h',
-  'deprecated/gtkuimanager.h',
-  'deprecated/gtkvbbox.h',
-  'deprecated/gtkvbox.h',
-  'deprecated/gtkvscale.h',
-  'deprecated/gtkvscrollbar.h',
-  'deprecated/gtkvseparator.h',
-  'deprecated/gtkvpaned.h',
+  'gtkx-autocleanups.h',
+  'gtkx.h',
 ])
 
 gtk_unix_sources = files([
   'gtkcustompaperunixdialog.c',
   'gtkpagesetupunixdialog.c',
+  'gtkprintbackend.c',
   'gtkprinter.c',
   'gtkprinteroption.c',
   'gtkprinteroptionset.c',
@@ -653,7 +612,6 @@ gtk_unix_sources = files([
   'gtkprintjob.c',
   'gtkprintoperation-unix.c',
   'gtkprintunixdialog.c',
-  'gtkprintbackend.c',
   'gtksearchenginetracker.c',
 ])
 
@@ -705,19 +663,19 @@ gtkmarshal_c = custom_target(
   command : [mkmarshal, glib_marshal, '_gtk_marshal', '@INPUT@', '@OUTPUT@']
 )
 
-
-
 gtktypebuiltins_h = custom_target(
   'gtkypebuiltins_h',
   output  : 'gtktypebuiltins.h',
-  input   : gtk_public_h_sources + gtk_deprecated_type_headers,
-  command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.h.template', 
'@OUTPUT@', '@INPUT@']
+  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-3.0/gtk/' # XXX ???
 )
 
 gtktypebuiltins_c = custom_target(
   'gtkypebuiltins_c',
   output  : 'gtktypebuiltins.c',
-  input   : gtk_public_h_sources +  gtk_deprecated_type_headers,
+  input   : gtk_public_headers +  gtk_deprecated_headers,
   depends : gtktypebuiltins_h,
   command : [mkenum, perl, glib_mkenums, meson.current_source_dir() + '/gtktypebuiltins.c.template', 
'@OUTPUT@', '@INPUT@']
 )
@@ -743,7 +701,7 @@ typefuncs = custom_target(
   'typefuncs',
   depends: gdkenum_h,
   output : 'gtktypefuncs.c',
-  input  : gdk_headers + gtk_public_h_sources + gtk_deprecated_type_headers + gtk_private_h_sources + 
[gtktypebuiltins_h] + [gdkenum_h],
+  input  : gdk_headers + gtk_public_headers + gtk_deprecated_headers + gtk_private_headers + 
[gtktypebuiltins_h] + [gdkenum_h],
   command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
   install: false,
 )
@@ -758,7 +716,8 @@ cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)
 gtkversion = configure_file(
   input  : 'gtkversion.h.in',
   output : 'gtkversion.h',
-  configuration: cdata
+  configuration: cdata,
+  install_dir: 'include/gtk-3.0/gtk/' # XXX ???
 )
 
 gtk_cargs = [
@@ -775,7 +734,7 @@ gtk_cargs = [
 gtk_sources += [
   gtk_dbus_src,
   gtk_unix_sources,
-  gtk_deprecated_c_sources,
+  gtk_deprecated_sources,
   dnd_sources,
   inspector_sources,
   a11y_sources,
@@ -809,29 +768,32 @@ if x11_enabled
     error('Could not get x11 data prefix via pkg-config.')
   endif
 
-  gtk_sources += [
-    gtk_x11_sources,
-    gtk_use_wayland_or_x11_c_sources
-  ]
+  gtk_sources += gtk_x11_sources
   gtk_deps += [
     xi_dep,
     x11_dep,
-    pangoft_dep
   ]
 endif
 
 if wayland_enabled
-  gtk_sources += [
-    gtk_wayland_sources,
-    gtk_use_wayland_or_x11_c_sources
-  ]
-  gtk_deps += [
-    pangoft_dep
-  ]
+  gtk_sources += gtk_wayland_sources
+endif
+
+# So we don't add these twice
+if x11_enabled or wayland_enabled
+  gtk_sources += gtk_use_wayland_or_x11_c_sources
+  gtk_deps += pangoft_dep
 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',
   gtk_sources,
   gtkmarshal_h,
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
new file mode 100644
index 0000000..6c753aa
--- /dev/null
+++ b/testsuite/a11y/meson.build
@@ -0,0 +1,11 @@
+
+
+test_text = executable(
+  'a11y_test_text',
+  'text.c',
+  dependencies: libgtk_dep
+)
+test('a11y/text', test_text)
+
+
+
diff --git a/testsuite/meson.build b/testsuite/meson.build
index a3507d5..87638b7 100644
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -1,3 +1,6 @@
 subdir('gtk')
 subdir('gdk')
 subdir('css')
+subdir('a11y')
+# subdir('tools')
+# subdir('reftests')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]