project: Move a few classes to core/

po/POTFILES.in

@@ -19,7 +19,6 @@ data/ui/year-view.ui
 src/gcal-application.c
 src/gcal-date-selector.c
 src/gcal-edit-dialog.c
-src/gcal-event.c
 src/gcal-event-widget.c
 src/gcal-manager.c
 src/gcal-quick-add-popover.c
@@ -27,6 +26,7 @@ src/gcal-source-dialog.c
 src/gcal-time-selector.c
 src/gcal-window.c
 src/main.c
+src/core/gcal-event.c
 src/utils/gcal-utils.c
 src/views/gcal-month-view.c
 src/views/gcal-week-grid.c

src/meson.build

@@ -20,6 +20,12 @@ gcal_deps = [
 ]
 
 sources = files(
+  'core/gcal-calendar.c',
+  'core/gcal-clock.c',
+  'core/gcal-event.c',
+  'core/gcal-manager.c',
+  'core/gcal-recurrence.c',
+  'core/gcal-timer.c',
   'search/gcal-search-button.c',
   'search/gcal-search-engine.c',
   'search/gcal-search-hit.c',
@@ -41,27 +47,21 @@ sources = files(
   'weather/gcal-weather-service.c',
   'weather/gcal-weather-settings.c',
   'gcal-application.c',
-  'gcal-clock.c',
-  'gcal-calendar.c',
   'gcal-context.c',
   'gcal-date-chooser-day.c',
   'gcal-date-chooser.c',
   'gcal-date-selector.c',
   'gcal-edit-dialog.c',
   'gcal-event-widget.c',
-  'gcal-event.c',
   'gcal-log.c',
-  'gcal-manager.c',
   'gcal-multi-choice.c',
   'gcal-night-light-monitor.c',
   'gcal-quick-add-popover.c',
-  'gcal-recurrence.c',
   'gcal-shell-search-provider.c',
   'gcal-source-dialog.c',
   'gcal-time-selector.c',
   'gcal-time-zone-monitor.c',
   'gcal-window.c',
-  'gcal-timer.c'
 )
 
 enum_types = 'gcal-enum-types'
@@ -111,15 +111,16 @@ sources += configure_file(
 # Include directories #
 #######################
 
-incs = [
+calendar_incs = [
   top_inc,
+  include_directories('core'),
   include_directories('search'),
   include_directories('utils'),
   include_directories('views'),
   include_directories('weather'),
 ]
 
-incs += contrib_incs
+calendar_incs += contrib_incs
 
 
 ###################
@@ -129,7 +130,7 @@ incs += contrib_incs
 libgcal = shared_library(
                'gcal-private',
               sources: sources,
-  include_directories: incs,
+  include_directories: calendar_incs,
          dependencies: gcal_deps,
               install: false,
 )
@@ -147,7 +148,7 @@ libgcal_dep = declare_dependency(
 executable(
   meson.project_name(),
        sources + files('main.c'),
-   include_directories: incs,
+   include_directories: calendar_incs,
           dependencies: gcal_deps,
                install: true,
            install_dir: calendar_bindir

tests/meson.build

@@ -19,8 +19,9 @@ test_cflags = '-DTEST_DATA_DIR="@0@"'.format(join_paths(meson.source_root(), 'da
 test_event = executable(
      'test-event',
     ['test-event.c', compiled_schemas],
-        c_args: test_cflags,
+               c_args: test_cflags,
-  dependencies: test_deps
+         dependencies: test_deps,
+  include_directories: calendar_incs,
 )
 
 test('test-event', test_event, env: test_env)
@@ -33,8 +34,9 @@ test('test-event', test_event, env: test_env)
 test_manager = executable(
      'test-manager',
     ['test-manager.c', compiled_schemas],
-        c_args: test_cflags,
+               c_args: test_cflags,
-  dependencies: test_deps
+         dependencies: test_deps,
+  include_directories: calendar_incs,
 )
 
 test('test-manager', test_manager, env: test_env)