GNOME.org
 

[libdazzle] Finish the build split

commit a7d3b88a3f5854d1741974aa330d261da3c59a6e
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue May 30 12:54:08 2017 +0100

    Finish the build split
    
    Move the sources listing into each sub-directory.

 src/actions/meson.build      |    8 ++
 src/animation/meson.build    |    7 ++
 src/app/meson.build          |    6 ++
 src/bindings/meson.build     |    6 ++
 src/cache/meson.build        |    5 +
 src/files/meson.build        |    6 ++
 src/fuzzy/meson.build        |   19 ++++
 src/graphing/meson.build     |   12 +++-
 src/menus/meson.build        |    9 ++
 src/meson.build              |  190 ++----------------------------------------
 src/panel/meson.build        |   19 ++++
 src/pathbar/meson.build      |   16 ++++
 src/prefs/meson.build        |   32 +++++++
 src/search/meson.build       |   13 +++-
 src/settings/meson.build     |    5 +
 src/shortcuts/meson.build    |   20 +++++
 src/statemachine/meson.build |   10 ++-
 src/suggestions/meson.build  |   13 ++-
 src/theming/meson.build      |    6 ++
 src/tree/meson.build         |    7 ++
 src/util/dzl-int-pair.h      |    4 +
 src/util/meson.build         |   22 +++++
 src/widgets/meson.build      |   31 +++++++
 23 files changed, 276 insertions(+), 190 deletions(-)
---
diff --git a/src/actions/meson.build b/src/actions/meson.build
index f1a6dbf..3a9dd2a 100644
--- a/src/actions/meson.build
+++ b/src/actions/meson.build
@@ -5,6 +5,14 @@ action_headers = [
   'dzl-widget-action-group.h',
 ]
 
+action_sources = [
+  'dzl-child-property-action.c',
+  'dzl-properties-group.c',
+  'dzl-settings-flag-action.c',
+  'dzl-widget-action-group.c',
+]
+
 libdazzle_public_headers += files(action_headers)
+libdazzle_public_sources += files(action_sources)
 
 install_headers(action_headers, subdir: join_paths(libdazzle_header_subdir, 'actions'))
diff --git a/src/animation/meson.build b/src/animation/meson.build
index a704d7e..48f045f 100644
--- a/src/animation/meson.build
+++ b/src/animation/meson.build
@@ -3,6 +3,13 @@ animation_headers = [
   'dzl-box-theatric.h',
 ]
 
+animation_sources = [
+  'dzl-animation.c',
+  'dzl-box-theatric.c',
+]
+
 libdazzle_public_headers += files(animation_headers)
+libdazzle_public_sources += files(animation_sources)
+libdazzle_private_sources += files('dzl-frame-source.c')
 
 install_headers(animation_headers, subdir: join_paths(libdazzle_header_subdir, 'animation'))
diff --git a/src/app/meson.build b/src/app/meson.build
index fd6ec63..363569c 100644
--- a/src/app/meson.build
+++ b/src/app/meson.build
@@ -3,6 +3,12 @@ app_headers = [
   'dzl-application-window.h',
 ]
 
+app_sources = [
+  'dzl-application.c',
+  'dzl-application-window.c',
+]
+
 libdazzle_public_headers += files(app_headers)
+libdazzle_public_sources += files(app_sources)
 
 install_headers(app_headers, subdir: join_paths(libdazzle_header_subdir, 'app'))
diff --git a/src/bindings/meson.build b/src/bindings/meson.build
index 37917fd..27c9732 100644
--- a/src/bindings/meson.build
+++ b/src/bindings/meson.build
@@ -3,6 +3,12 @@ bindings_headers = [
   'dzl-signal-group.h',
 ]
 
+bindings_sources = [
+  'dzl-binding-group.c',
+  'dzl-signal-group.c',
+]
+
 libdazzle_public_headers += files(bindings_headers)
+libdazzle_public_sources += files(bindings_sources)
 
 install_headers(bindings_headers, subdir: join_paths(libdazzle_header_subdir, 'bindings'))
diff --git a/src/cache/meson.build b/src/cache/meson.build
index ee63656..a441a74 100644
--- a/src/cache/meson.build
+++ b/src/cache/meson.build
@@ -2,6 +2,11 @@ cache_headers = [
   'dzl-task-cache.h',
 ]
 
+cache_sources = [
+  'dzl-task-cache.c',
+]
+
 libdazzle_public_headers += files(cache_headers)
+libdazzle_public_sources += files(cache_sources)
 
 install_headers(cache_headers, subdir: join_paths(libdazzle_header_subdir, 'cache'))
diff --git a/src/files/meson.build b/src/files/meson.build
index 1953caf..d777b6a 100644
--- a/src/files/meson.build
+++ b/src/files/meson.build
@@ -3,6 +3,12 @@ files_headers = [
   'dzl-directory-reaper.h',
 ]
 
+files_sources = [
+  'dzl-directory-model.c',
+  'dzl-directory-reaper.c',
+]
+
 libdazzle_public_headers += files(files_headers)
+libdazzle_public_sources += files(files_sources)
 
 install_headers(files_headers, subdir: join_paths(libdazzle_header_subdir, 'files'))
diff --git a/src/fuzzy/meson.build b/src/fuzzy/meson.build
new file mode 100644
index 0000000..1736250
--- /dev/null
+++ b/src/fuzzy/meson.build
@@ -0,0 +1,19 @@
+fuzzy_headers = [
+  'dzl-fuzzy-index-builder.h',
+  'dzl-fuzzy-index-cursor.h',
+  'dzl-fuzzy-index-match.h',
+  'dzl-fuzzy-index.h',
+]
+
+fuzzy_sources = [
+  'dzl-fuzzy-index-builder.c',
+  'dzl-fuzzy-index-cursor.c',
+  'dzl-fuzzy-index-match.c',
+  'dzl-fuzzy-index.c',
+]
+
+libdazzle_public_headers += files(fuzzy_headers)
+libdazzle_public_sources += files(fuzzy_sources)
+libdazzle_private_sources += files('dzl-fuzzy-util.c')
+
+install_headers(fuzzy_headers, subdir: join_paths(libdazzle_header_subdir, 'fuzzy'))
diff --git a/src/graphing/meson.build b/src/graphing/meson.build
index 08e6003..f968e94 100644
--- a/src/graphing/meson.build
+++ b/src/graphing/meson.build
@@ -2,13 +2,23 @@ graphing_headers = [
   'dzl-cpu-graph.h',
   'dzl-cpu-model.h',
   'dzl-graph-column.h',
-  'dzl-graph-column-private.h',
   'dzl-graph-line-renderer.h',
   'dzl-graph-model.h',
   'dzl-graph-renderer.h',
   'dzl-graph-view.h',
 ]
 
+graphing_sources = [
+  'dzl-cpu-graph.c',
+  'dzl-cpu-model.c',
+  'dzl-graph-column.c',
+  'dzl-graph-line-renderer.c',
+  'dzl-graph-model.c',
+  'dzl-graph-renderer.c',
+  'dzl-graph-view.c',
+]
+
 libdazzle_public_headers += files(graphing_headers)
+libdazzle_public_sources += files(graphing_sources)
 
 install_headers(graphing_headers, subdir: join_paths(libdazzle_header_subdir, 'graphing'))
diff --git a/src/menus/meson.build b/src/menus/meson.build
index 5f40852..06452b9 100644
--- a/src/menus/meson.build
+++ b/src/menus/meson.build
@@ -6,6 +6,15 @@ menus_headers = [
   'dzl-menu-manager.h',
 ]
 
+menus_sources = [
+  'dzl-joined-menu.c',
+  'dzl-menu-button-item.c',
+  'dzl-menu-button-section.c',
+  'dzl-menu-button.c',
+  'dzl-menu-manager.c',
+]
+
 libdazzle_public_headers += files(menus_headers)
+libdazzle_public_sources += files(menus_sources)
 
 install_headers(menus_headers, subdir: join_paths(libdazzle_header_subdir, 'menus'))
diff --git a/src/meson.build b/src/meson.build
index 271e90d..c1ab75c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,13 +35,12 @@ libdazzle_generated_headers = [
   dzl_version_h,
 ]
 
-non_introspectable_public_headers = [
-  'util/dzl-int-pair.h',
-]
+install_headers('dazzle.h', subdir: libdazzle_header_subdir)
 
-libdazzle_public_headers = [
-  'dazzle.h',
-]
+# Filled out in the subdirs
+libdazzle_public_headers = []
+libdazzle_public_sources = []
+libdazzle_private_sources = []
 
 subdir('actions')
 subdir('animation')
@@ -52,6 +51,8 @@ subdir('files')
 subdir('graphing')
 subdir('menus')
 subdir('panel')
+subdir('pathbar')
+subdir('prefs')
 subdir('search')
 subdir('settings')
 subdir('shortcuts')
@@ -62,185 +63,10 @@ subdir('tree')
 subdir('util')
 subdir('widgets')
 
-libdazzle_public_sources = [
-  'actions/dzl-child-property-action.c',
-  'actions/dzl-properties-group.c',
-  'actions/dzl-settings-flag-action.c',
-  'actions/dzl-widget-action-group.c',
-
-  'animation/dzl-animation.c',
-  'animation/dzl-box-theatric.c',
-
-  'app/dzl-application.c',
-  'app/dzl-application-window.c',
-
-  'bindings/dzl-binding-group.c',
-  'bindings/dzl-signal-group.c',
-
-  'cache/dzl-task-cache.c',
-
-  'files/dzl-directory-model.c',
-  'files/dzl-directory-reaper.c',
-
-  'graphing/dzl-cpu-graph.c',
-  'graphing/dzl-cpu-model.c',
-  'graphing/dzl-graph-column.c',
-  'graphing/dzl-graph-line-renderer.c',
-  'graphing/dzl-graph-model.c',
-  'graphing/dzl-graph-renderer.c',
-  'graphing/dzl-graph-view.c',
-
-  'menus/dzl-joined-menu.c',
-  'menus/dzl-menu-button.c',
-  'menus/dzl-menu-button-item.c',
-  'menus/dzl-menu-button-section.c',
-  'menus/dzl-menu-manager.c',
-
-  'panel/dzl-dock-bin-edge.c',
-  'panel/dzl-dock-bin.c',
-  'panel/dzl-dock-item.c',
-  'panel/dzl-dock-manager.c',
-  'panel/dzl-dock-overlay-edge.c',
-  'panel/dzl-dock-overlay.c',
-  'panel/dzl-dock-paned.c',
-  'panel/dzl-dock-revealer.c',
-  'panel/dzl-dock-stack.c',
-  'panel/dzl-dock-transient-grab.c',
-  'panel/dzl-dock-widget.c',
-  'panel/dzl-dock-window.c',
-  'panel/dzl-dock.c',
-  'panel/dzl-tab-strip.c',
-  'panel/dzl-tab.c',
-
-  'pathbar/dzl-path.c',
-  'pathbar/dzl-path-bar.c',
-  'pathbar/dzl-path-element.c',
-
-  'prefs/dzl-preferences-bin.c',
-  'prefs/dzl-preferences-entry.c',
-  'prefs/dzl-preferences-file-chooser-button.c',
-  'prefs/dzl-preferences-flow-box.c',
-  'prefs/dzl-preferences-font-button.c',
-  'prefs/dzl-preferences-group.c',
-  'prefs/dzl-preferences-page.c',
-  'prefs/dzl-preferences-spin-button.c',
-  'prefs/dzl-preferences-switch.c',
-  'prefs/dzl-preferences-view.c',
-  'prefs/dzl-preferences.c',
-
-  'search/dzl-fuzzy-index-builder.c',
-  'search/dzl-fuzzy-index-cursor.c',
-  'search/dzl-fuzzy-index-match.c',
-  'search/dzl-fuzzy-index.c',
-  'search/dzl-fuzzy-mutable-index.c',
-  'search/dzl-levenshtein.c',
-  'search/dzl-pattern-spec.c',
-  'search/dzl-trie.c',
-
-  'settings/dzl-settings-sandwich.c',
-
-  'shortcuts/dzl-shortcut-accel-dialog.c',
-  'shortcuts/dzl-shortcut-chord.c',
-  'shortcuts/dzl-shortcut-context.c',
-  'shortcuts/dzl-shortcut-controller.c',
-  'shortcuts/dzl-shortcut-label.c',
-  'shortcuts/dzl-shortcut-manager.c',
-  'shortcuts/dzl-shortcut-model.c',
-  'shortcuts/dzl-shortcut-theme-editor.c',
-  'shortcuts/dzl-shortcut-theme-load.c',
-  'shortcuts/dzl-shortcut-theme-save.c',
-  'shortcuts/dzl-shortcut-theme.c',
-  'shortcuts/dzl-shortcuts-group.c',
-  'shortcuts/dzl-shortcuts-section.c',
-  'shortcuts/dzl-shortcuts-shortcut.c',
-  'shortcuts/dzl-shortcuts-window.c',
-
-  'statemachine/dzl-state-machine-buildable.c',
-  'statemachine/dzl-state-machine.c',
-
-  'suggestions/dzl-suggestion-entry-buffer.c',
-  'suggestions/dzl-suggestion-entry.c',
-  'suggestions/dzl-suggestion-popover.c',
-  'suggestions/dzl-suggestion-row.c',
-  'suggestions/dzl-suggestion.c',
-
-  'tree/dzl-tree-builder.c',
-  'tree/dzl-tree.c',
-  'tree/dzl-tree-node.c',
-
-  'util/dzl-cairo.c',
-  'util/dzl-counter.c',
-  'util/dzl-date-time.c',
-  'util/dzl-dnd.c',
-  'util/dzl-file-manager.c',
-  'util/dzl-gdk.c',
-  'util/dzl-gtk.c',
-  'util/dzl-heap.c',
-  'util/dzl-pango.c',
-  'util/dzl-rgba.c',
-  'util/dzl-ring.c',
-  'util/dzl-util.c',
-  'util/dzl-variant.c',
-
-  'theming/dzl-css-provider.c',
-  'theming/dzl-theme-manager.c',
-
-  'widgets/dzl-bin.c',
-  'widgets/dzl-bolding-label.c',
-  'widgets/dzl-box.c',
-  'widgets/dzl-centering-bin.c',
-  'widgets/dzl-column-layout.c',
-  'widgets/dzl-counters-window.c',
-  'widgets/dzl-elastic-bin.c',
-  'widgets/dzl-empty-state.c',
-  'widgets/dzl-entry-box.c',
-  'widgets/dzl-file-chooser-entry.c',
-  'widgets/dzl-list-box.c',
-  'widgets/dzl-list-box-row.c',
-  'widgets/dzl-multi-paned.c',
-  'widgets/dzl-pill-box.c',
-  'widgets/dzl-priority-box.c',
-  'widgets/dzl-progress-button.c',
-  'widgets/dzl-progress-menu-button.c',
-  'widgets/dzl-progress-icon.c',
-  'widgets/dzl-radio-box.c',
-  'widgets/dzl-scrolled-window.c',
-  'widgets/dzl-search-bar.c',
-  'widgets/dzl-simple-label.c',
-  'widgets/dzl-simple-popover.c',
-  'widgets/dzl-slider.c',
-  'widgets/dzl-stack-list.c',
-  'widgets/dzl-three-grid.c',
-]
-
 libdazzle_sources = [
-  non_introspectable_public_headers,
   libdazzle_generated_headers,
   libdazzle_public_sources,
-
-  'animation/dzl-frame-source.c',
-
-  'graphing/dzl-graph-column-private.h',
-
-  'panel/dzl-dock-bin-edge-private.h',
-  'panel/dzl-dock-paned-private.h',
-  'panel/dzl-tab-private.h',
-
-  'prefs/dzl-preferences-bin-private.h',
-  'prefs/dzl-preferences-group-private.h',
-  'prefs/dzl-preferences-page-private.h',
-
-  'search/dzl-fuzzy-index-private.h',
-
-  'shortcuts/dzl-shortcut-closure-chain.c',
-
-  'tree/dzl-tree-private.h',
-
-  'util/dzl-util-private.h',
-
-  'widgets/dzl-list-box-private.h',
-  'widgets/dzl-rect-helper.c',
-
+  libdazzle_private_sources,
   libdazzle_resources,
 ]
 
diff --git a/src/panel/meson.build b/src/panel/meson.build
index 0645c2b..2b28813 100644
--- a/src/panel/meson.build
+++ b/src/panel/meson.build
@@ -17,6 +17,25 @@ panel_headers = [
   'dzl-tab.h',
 ]
 
+panel_sources = [
+  'dzl-dock-bin-edge.c',
+  'dzl-dock-bin.c',
+  'dzl-dock-item.c',
+  'dzl-dock-manager.c',
+  'dzl-dock-overlay-edge.c',
+  'dzl-dock-overlay.c',
+  'dzl-dock-paned.c',
+  'dzl-dock-revealer.c',
+  'dzl-dock-stack.c',
+  'dzl-dock-transient-grab.c',
+  'dzl-dock-widget.c',
+  'dzl-dock-window.c',
+  'dzl-dock.c',
+  'dzl-tab-strip.c',
+  'dzl-tab.c',
+]
+
 libdazzle_public_headers += files(panel_headers)
+libdazzle_public_sources += files(panel_sources)
 
 install_headers(panel_headers, subdir: join_paths(libdazzle_header_subdir, 'panel'))
diff --git a/src/pathbar/meson.build b/src/pathbar/meson.build
new file mode 100644
index 0000000..7234b58
--- /dev/null
+++ b/src/pathbar/meson.build
@@ -0,0 +1,16 @@
+pathbar_headers = [
+  'dzl-path-bar.h',
+  'dzl-path-element.h',
+  'dzl-path.h',
+]
+
+pathbar_sources = [
+  'dzl-path-bar.c',
+  'dzl-path.c',
+  'dzl-path-element.c',
+]
+
+libdazzle_public_headers += files(pathbar_headers)
+libdazzle_public_sources += files(pathbar_sources)
+
+install_headers(pathbar_headers, subdir: join_paths(libdazzle_header_subdir, 'pathbar'))
diff --git a/src/prefs/meson.build b/src/prefs/meson.build
new file mode 100644
index 0000000..94ecd76
--- /dev/null
+++ b/src/prefs/meson.build
@@ -0,0 +1,32 @@
+prefs_headers = [
+  'dzl-preferences-bin.h',
+  'dzl-preferences-entry.h',
+  'dzl-preferences-file-chooser-button.h',
+  'dzl-preferences-flow-box.h',
+  'dzl-preferences-font-button.h',
+  'dzl-preferences-group.h',
+  'dzl-preferences-page.h',
+  'dzl-preferences-spin-button.h',
+  'dzl-preferences-switch.h',
+  'dzl-preferences-view.h',
+  'dzl-preferences.h',
+]
+
+prefs_sources = [
+  'dzl-preferences-bin.c',
+  'dzl-preferences-entry.c',
+  'dzl-preferences-file-chooser-button.c',
+  'dzl-preferences-flow-box.c',
+  'dzl-preferences-font-button.c',
+  'dzl-preferences-group.c',
+  'dzl-preferences-page.c',
+  'dzl-preferences-spin-button.c',
+  'dzl-preferences-switch.c',
+  'dzl-preferences-view.c',
+  'dzl-preferences.c',
+]
+
+libdazzle_public_headers += files(prefs_headers)
+libdazzle_public_sources += files(prefs_sources)
+
+install_headers(prefs_headers, subdir: join_paths(libdazzle_header_subdir, 'prefs'))
diff --git a/src/search/meson.build b/src/search/meson.build
index f27ddb4..5d8b72f 100644
--- a/src/search/meson.build
+++ b/src/search/meson.build
@@ -3,13 +3,24 @@ search_headers = [
   'dzl-fuzzy-index-cursor.h',
   'dzl-fuzzy-index.h',
   'dzl-fuzzy-index-match.h',
-  'dzl-fuzzy-index-private.h',
   'dzl-fuzzy-mutable-index.h',
   'dzl-levenshtein.h',
   'dzl-pattern-spec.h',
   'dzl-trie.h',
 ]
 
+search_sources = [
+  'dzl-fuzzy-index-builder.c',
+  'dzl-fuzzy-index-cursor.c',
+  'dzl-fuzzy-index.c',
+  'dzl-fuzzy-index-match.c',
+  'dzl-fuzzy-mutable-index.c',
+  'dzl-levenshtein.c',
+  'dzl-pattern-spec.c',
+  'dzl-trie.c',
+]
+
 libdazzle_public_headers += files(search_headers)
+libdazzle_public_sources += files(search_sources)
 
 install_headers(search_headers, subdir: join_paths(libdazzle_header_subdir, 'search'))
diff --git a/src/settings/meson.build b/src/settings/meson.build
index c0f8246..5d7d398 100644
--- a/src/settings/meson.build
+++ b/src/settings/meson.build
@@ -2,6 +2,11 @@ settings_headers = [
   'dzl-settings-sandwich.h',
 ]
 
+settings_sources = [
+  'dzl-settings-sandwich.c',
+]
+
 libdazzle_public_headers += files(settings_headers)
+libdazzle_public_sources += files(settings_sources)
 
 install_headers(settings_headers, subdir: join_paths(libdazzle_header_subdir, 'settings'))
diff --git a/src/shortcuts/meson.build b/src/shortcuts/meson.build
index 860d0bd..170110b 100644
--- a/src/shortcuts/meson.build
+++ b/src/shortcuts/meson.build
@@ -14,6 +14,26 @@ shortcuts_headers = [
   'dzl-shortcuts-window.h',
 ]
 
+shortcuts_sources = [
+  'dzl-shortcut-accel-dialog.c',
+  'dzl-shortcut-chord.c',
+  'dzl-shortcut-context.c',
+  'dzl-shortcut-controller.c',
+  'dzl-shortcut-label.c',
+  'dzl-shortcut-manager.c',
+  'dzl-shortcut-model.c',
+  'dzl-shortcut-theme-editor.c',
+  'dzl-shortcut-theme-load.c',
+  'dzl-shortcut-theme-save.c',
+  'dzl-shortcut-theme.c',
+  'dzl-shortcuts-group.c',
+  'dzl-shortcuts-section.c',
+  'dzl-shortcuts-shortcut.c',
+  'dzl-shortcuts-window.c',
+]
+
 libdazzle_public_headers += files(shortcuts_headers)
+libdazzle_public_sources += files(shortcuts_sources)
+libdazzle_private_sources += files('dzl-shortcut-closure-chain.c')
 
 install_headers(shortcuts_headers, subdir: join_paths(libdazzle_header_subdir, 'shortcuts'))
diff --git a/src/statemachine/meson.build b/src/statemachine/meson.build
index 2bab1d9..546c9ef 100644
--- a/src/statemachine/meson.build
+++ b/src/statemachine/meson.build
@@ -3,8 +3,12 @@ statemachine_headers = [
   'dzl-state-machine.h',
 ]
 
-foreach h: statemachine_headers
-  libdazzle_public_headers += files(h)
-endforeach
+statemachine_sources = [
+  'dzl-state-machine-buildable.c',
+  'dzl-state-machine.c',
+]
+
+libdazzle_public_headers += files(statemachine_headers)
+libdazzle_public_sources += files(statemachine_sources)
 
 install_headers(statemachine_headers, subdir: join_paths(libdazzle_header_subdir, 'statemachine'))
diff --git a/src/suggestions/meson.build b/src/suggestions/meson.build
index 9360d2c..db91b61 100644
--- a/src/suggestions/meson.build
+++ b/src/suggestions/meson.build
@@ -6,8 +6,15 @@ suggestions_headers = [
   'dzl-suggestion.h',
 ]
 
-foreach h: suggestions_headers
-  libdazzle_public_headers += files(h)
-endforeach
+suggestions_sources = [
+  'dzl-suggestion-entry-buffer.c',
+  'dzl-suggestion-entry.c',
+  'dzl-suggestion-popover.c',
+  'dzl-suggestion-row.c',
+  'dzl-suggestion.c',
+]
+
+libdazzle_public_headers += files(suggestions_headers)
+libdazzle_public_sources += files(suggestions_sources)
 
 install_headers(suggestions_headers, subdir: join_paths(libdazzle_header_subdir, 'suggestions'))
diff --git a/src/theming/meson.build b/src/theming/meson.build
index 8aa1fd1..f9ebe32 100644
--- a/src/theming/meson.build
+++ b/src/theming/meson.build
@@ -3,6 +3,12 @@ theming_headers = [
   'dzl-theme-manager.h',
 ]
 
+theming_sources = [
+  'dzl-css-provider.c',
+  'dzl-theme-manager.c',
+]
+
 libdazzle_public_headers += files(theming_headers)
+libdazzle_public_sources += files(theming_sources)
 
 install_headers(theming_headers, subdir: join_paths(libdazzle_header_subdir, 'theming'))
diff --git a/src/tree/meson.build b/src/tree/meson.build
index 2a34838..39ec060 100644
--- a/src/tree/meson.build
+++ b/src/tree/meson.build
@@ -5,6 +5,13 @@ tree_headers = [
   'dzl-tree.h',
 ]
 
+tree_sources = [
+  'dzl-tree-builder.c',
+  'dzl-tree.c',
+  'dzl-tree-node.c',
+]
+
 libdazzle_public_headers += files(tree_headers)
+libdazzle_public_sources += files(tree_sources)
 
 install_headers(tree_headers, subdir: join_paths(libdazzle_header_subdir, 'tree'))
diff --git a/src/util/dzl-int-pair.h b/src/util/dzl-int-pair.h
index 67d57d0..1a99c6b 100644
--- a/src/util/dzl-int-pair.h
+++ b/src/util/dzl-int-pair.h
@@ -19,6 +19,8 @@
 #ifndef DZL_INT_PAIR_H
 #define DZL_INT_PAIR_H
 
+#ifndef __GI_SCANNER__
+
 #include <glib.h>
 
 G_BEGIN_DECLS
@@ -197,4 +199,6 @@ dzl_uint_pair_free (DzlUIntPair *pair)
 
 G_END_DECLS
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* DZL_INT_PAIR_H */
diff --git a/src/util/meson.build b/src/util/meson.build
index d1e8e9b..e5575e6 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -4,11 +4,33 @@ util_headers = [
   'dzl-date-time.h',
   'dzl-dnd.h',
   'dzl-file-manager.h',
+  'dzl-gdk.h',
+  'dzl-gtk.h',
   'dzl-heap.h',
+  'dzl-int-pair.h',
   'dzl-pango.h',
   'dzl-rgba.h',
+  'dzl-ring.h',
+  'dzl-variant.h',
+]
+
+util_sources = [
+  'dzl-cairo.c',
+  'dzl-counter.c',
+  'dzl-date-time.c',
+  'dzl-dnd.c',
+  'dzl-file-manager.c',
+  'dzl-gdk.c',
+  'dzl-gtk.c',
+  'dzl-heap.c',
+  'dzl-pango.c',
+  'dzl-rgba.c',
+  'dzl-ring.c',
+  'dzl-util.c',
+  'dzl-variant.c',
 ]
 
 libdazzle_public_headers += files(util_headers)
+libdazzle_public_sources += files(util_sources)
 
 install_headers(util_headers, subdir: join_paths(libdazzle_header_subdir, 'util'))
diff --git a/src/widgets/meson.build b/src/widgets/meson.build
index bc10ceb..5563357 100644
--- a/src/widgets/meson.build
+++ b/src/widgets/meson.build
@@ -27,6 +27,37 @@ widgets_headers = [
   'dzl-three-grid.h',
 ]
 
+widgets_sources = [
+  'dzl-bin.c',
+  'dzl-bolding-label.c',
+  'dzl-box.c',
+  'dzl-centering-bin.c',
+  'dzl-column-layout.c',
+  'dzl-counters-window.c',
+  'dzl-elastic-bin.c',
+  'dzl-empty-state.c',
+  'dzl-entry-box.c',
+  'dzl-file-chooser-entry.c',
+  'dzl-list-box.c',
+  'dzl-list-box-row.c',
+  'dzl-multi-paned.c',
+  'dzl-pill-box.c',
+  'dzl-priority-box.c',
+  'dzl-progress-button.c',
+  'dzl-progress-menu-button.c',
+  'dzl-progress-icon.c',
+  'dzl-radio-box.c',
+  'dzl-scrolled-window.c',
+  'dzl-search-bar.c',
+  'dzl-simple-label.c',
+  'dzl-simple-popover.c',
+  'dzl-slider.c',
+  'dzl-stack-list.c',
+  'dzl-three-grid.c',
+]
+
 libdazzle_public_headers += files(widgets_headers)
+libdazzle_public_sources += files(widgets_sources)
+libdazzle_private_sources += files('dzl-rect-helper.c')
 
 install_headers(widgets_headers, subdir: join_paths(libdazzle_header_subdir, 'widgets'))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]