[gnome-calendar/gbsneto/edit-dialog-cleanup: 1/23] project: Split meson files in subdirs
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gbsneto/edit-dialog-cleanup: 1/23] project: Split meson files in subdirs
- Date: Sat, 31 Oct 2020 18:47:17 +0000 (UTC)
commit eb954505e4587519b7a876af5c7dea82b65868f5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Fri Oct 30 13:45:50 2020 -0300
project: Split meson files in subdirs
It allows us to better control what each subdir does, etc. This is
only the first step; we want to also split GResources, etc.
src/core/meson.build | 20 ++++++++++
src/gui/calendar-management/meson.build | 9 +++++
src/gui/meson.build | 18 +++++++++
src/meson.build | 68 ++++-----------------------------
src/search/meson.build | 9 +++++
src/utils/meson.build | 7 ++++
src/views/meson.build | 12 ++++++
src/weather/meson.build | 7 ++++
8 files changed, 89 insertions(+), 61 deletions(-)
---
diff --git a/src/core/meson.build b/src/core/meson.build
new file mode 100644
index 00000000..90c0624b
--- /dev/null
+++ b/src/core/meson.build
@@ -0,0 +1,20 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-calendar.c',
+ 'gcal-calendar-monitor.c',
+ 'gcal-clock.c',
+ 'gcal-context.c',
+ 'gcal-event.c',
+ 'gcal-log.c',
+ 'gcal-manager.c',
+ 'gcal-night-light-monitor.c',
+ 'gcal-range.c',
+ 'gcal-range-tree.c',
+ 'gcal-recurrence.c',
+ 'gcal-shell-search-provider.c',
+ 'gcal-timeline.c',
+ 'gcal-timeline-subscriber.c',
+ 'gcal-timer.c',
+ 'gcal-time-zone-monitor.c',
+)
diff --git a/src/gui/calendar-management/meson.build b/src/gui/calendar-management/meson.build
new file mode 100644
index 00000000..2b0e057f
--- /dev/null
+++ b/src/gui/calendar-management/meson.build
@@ -0,0 +1,9 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-calendar-management-dialog.c',
+ 'gcal-calendar-management-page.c',
+ 'gcal-calendars-page.c',
+ 'gcal-edit-calendar-page.c',
+ 'gcal-new-calendar-page.c',
+)
diff --git a/src/gui/meson.build b/src/gui/meson.build
new file mode 100644
index 00000000..531bf7a4
--- /dev/null
+++ b/src/gui/meson.build
@@ -0,0 +1,18 @@
+subdir('calendar-management')
+
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-alarm-row.c',
+ 'gcal-application.c',
+ 'gcal-calendar-popover.c',
+ 'gcal-date-chooser.c',
+ 'gcal-date-chooser-day.c',
+ 'gcal-date-selector.c',
+ 'gcal-edit-dialog.c',
+ 'gcal-event-widget.c',
+ 'gcal-multi-choice.c',
+ 'gcal-quick-add-popover.c',
+ 'gcal-time-selector.c',
+ 'gcal-window.c',
+)
diff --git a/src/meson.build b/src/meson.build
index 409aedf8..8a23ce2a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -74,73 +74,19 @@ gcal_deps += libgcal_generated_sources_dep
calendar_incs = [
top_inc,
include_directories('.'),
- include_directories('core'),
- include_directories('gui'),
- include_directories(join_paths('gui', 'calendar-management')),
- include_directories('search'),
- include_directories('utils'),
- include_directories('views'),
- include_directories('weather'),
]
###################
# Private library #
###################
-sources = files(
- 'core/gcal-calendar.c',
- 'core/gcal-calendar-monitor.c',
- 'core/gcal-clock.c',
- 'core/gcal-context.c',
- 'core/gcal-event.c',
- 'core/gcal-log.c',
- 'core/gcal-manager.c',
- 'core/gcal-night-light-monitor.c',
- 'core/gcal-range.c',
- 'core/gcal-range-tree.c',
- 'core/gcal-recurrence.c',
- 'core/gcal-shell-search-provider.c',
- 'core/gcal-timeline.c',
- 'core/gcal-timeline-subscriber.c',
- 'core/gcal-timer.c',
- 'core/gcal-time-zone-monitor.c',
- 'gui/calendar-management/gcal-calendar-management-dialog.c',
- 'gui/calendar-management/gcal-calendar-management-page.c',
- 'gui/calendar-management/gcal-calendars-page.c',
- 'gui/calendar-management/gcal-edit-calendar-page.c',
- 'gui/calendar-management/gcal-new-calendar-page.c',
- 'gui/gcal-alarm-row.c',
- 'gui/gcal-application.c',
- 'gui/gcal-calendar-popover.c',
- 'gui/gcal-date-chooser.c',
- 'gui/gcal-date-chooser-day.c',
- 'gui/gcal-date-selector.c',
- 'gui/gcal-edit-dialog.c',
- 'gui/gcal-event-widget.c',
- 'gui/gcal-multi-choice.c',
- 'gui/gcal-quick-add-popover.c',
- 'gui/gcal-time-selector.c',
- 'gui/gcal-window.c',
- 'search/gcal-search-button.c',
- 'search/gcal-search-engine.c',
- 'search/gcal-search-hit.c',
- 'search/gcal-search-hit-event.c',
- 'search/gcal-search-model.c',
- 'utils/gcal-date-time-utils.c',
- 'utils/gcal-source-discoverer.c',
- 'utils/gcal-utils.c',
- 'views/gcal-month-cell.c',
- 'views/gcal-month-popover.c',
- 'views/gcal-month-view.c',
- 'views/gcal-view.c',
- 'views/gcal-week-grid.c',
- 'views/gcal-week-header.c',
- 'views/gcal-week-view.c',
- 'views/gcal-year-view.c',
- 'weather/gcal-weather-info.c',
- 'weather/gcal-weather-service.c',
- 'weather/gcal-weather-settings.c',
-)
+sources = files()
+subdir('core')
+subdir('gui')
+subdir('search')
+subdir('utils')
+subdir('views')
+subdir('weather')
libgcal = static_library(
'gcal-private',
diff --git a/src/search/meson.build b/src/search/meson.build
new file mode 100644
index 00000000..a39fa2df
--- /dev/null
+++ b/src/search/meson.build
@@ -0,0 +1,9 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-search-button.c',
+ 'gcal-search-engine.c',
+ 'gcal-search-hit.c',
+ 'gcal-search-hit-event.c',
+ 'gcal-search-model.c',
+)
diff --git a/src/utils/meson.build b/src/utils/meson.build
new file mode 100644
index 00000000..45be896c
--- /dev/null
+++ b/src/utils/meson.build
@@ -0,0 +1,7 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-date-time-utils.c',
+ 'gcal-source-discoverer.c',
+ 'gcal-utils.c',
+)
diff --git a/src/views/meson.build b/src/views/meson.build
new file mode 100644
index 00000000..d838de3c
--- /dev/null
+++ b/src/views/meson.build
@@ -0,0 +1,12 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-month-cell.c',
+ 'gcal-month-popover.c',
+ 'gcal-month-view.c',
+ 'gcal-view.c',
+ 'gcal-week-grid.c',
+ 'gcal-week-header.c',
+ 'gcal-week-view.c',
+ 'gcal-year-view.c',
+)
diff --git a/src/weather/meson.build b/src/weather/meson.build
new file mode 100644
index 00000000..44557dfd
--- /dev/null
+++ b/src/weather/meson.build
@@ -0,0 +1,7 @@
+calendar_incs += include_directories('.')
+
+sources += files(
+ 'gcal-weather-info.c',
+ 'gcal-weather-service.c',
+ 'gcal-weather-settings.c',
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]