project: Reorganize much

src/meson.build

@@ -22,10 +22,16 @@ gcal_deps = [
 sources = files(
   'core/gcal-calendar.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-recurrence.c',
+  'core/gcal-shell-search-provider.c',
   'core/gcal-timer.c',
+  'core/gcal-time-zone-monitor.c',
+  'gui/gcal-application.c',
   'gui/gcal-calendar-popover.c',
   'gui/gcal-date-chooser.c',
   'gui/gcal-date-chooser-day.c',
@@ -57,24 +63,18 @@ sources = files(
   'weather/gcal-weather-info.c',
   'weather/gcal-weather-service.c',
   'weather/gcal-weather-settings.c',
-  'gcal-application.c',
-  'gcal-context.c',
-  'gcal-log.c',
-  'gcal-night-light-monitor.c',
-  'gcal-shell-search-provider.c',
-  'gcal-time-zone-monitor.c',
 )
 
 enum_types = 'gcal-enum-types'
 
-sources += gnome.mkenums(
+built_sources = gnome.mkenums(
   enum_types,
      sources: enum_headers,
   c_template: enum_types + '.c.template',
   h_template: enum_types + '.h.template'
 )
 
-sources += gnome.compile_resources(
+built_sources += gnome.compile_resources(
   'gcal-resources',
          gresource,
         source_dir: data_dir,
@@ -83,7 +83,7 @@ sources += gnome.compile_resources(
             export: true
 )
 
-sources += gnome.gdbus_codegen(
+built_sources += gnome.gdbus_codegen(
   'gcal-shell-search-provider-generated',
   shell_search_provider_dbus_interfaces,
   interface_prefix: 'org.gnome.',
@@ -101,7 +101,7 @@ debug_conf.set10('ENABLE_TRACING', enable_tracing)
 
 debug = 'gcal-debug.h'
 
-sources += configure_file(
+built_sources += configure_file(
           input: debug + '.in',
          output: debug,
   configuration: debug_conf
@@ -139,6 +139,7 @@ libgcal = static_library(
 
 libgcal_dep = declare_dependency(
             link_with: libgcal,
+              sources: built_sources,
          dependencies: gcal_deps,
   include_directories: calendar_incs,
 )
@@ -151,8 +152,7 @@ libgcal_dep = declare_dependency(
 executable(
   meson.project_name(),
        files('main.c'),
-   include_directories: calendar_incs,
           dependencies: libgcal_dep,
                install: true,
-           install_dir: calendar_bindir
+           install_dir: calendar_bindir,
 )