diff options
| author | Oz Tiram <[email protected]> | 2025-04-04 00:30:25 +0200 |
|---|---|---|
| committer | Luke from DC <[email protected]> | 2025-04-04 22:19:13 +0000 |
| commit | 425b36ec07ea236c266ba63a93b670b472a1b130 (patch) | |
| tree | 61564322b5d680a174ec836fbcaa22bde68305cc | |
| parent | 710f8c6a87a432b358c13549a6e507ede7ad3b49 (diff) | |
| download | atril-425b36ec07ea236c266ba63a93b670b472a1b130.tar.bz2 atril-425b36ec07ea236c266ba63a93b670b472a1b130.tar.xz | |
fix: building atrild with explicit sources
Signed-off-by: Oz Tiram <[email protected]>
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | shell/meson.build | 16 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 6ae98a60..1ae9885c 100644 --- a/meson.build +++ b/meson.build @@ -268,7 +268,6 @@ shell_core_deps = [ gio, ] -# Process subdirectories in the correct order subdir('libdocument') subdir('libview') subdir('libmisc') diff --git a/shell/meson.build b/shell/meson.build index babff1aa..f3134949 100644 --- a/shell/meson.build +++ b/shell/meson.build @@ -106,7 +106,6 @@ atril_deps = [ libevproperties_dep ] -# Conditional compilation for DBus if get_option('enable_dbus') dbus_generated = gnome.gdbus_codegen( 'ev-gdbus-generated', @@ -116,6 +115,9 @@ if get_option('enable_dbus') object_manager: true, ) + shell_sources += dbus_generated + + # Generate the daemon D-Bus code dbus_daemon_generated = gnome.gdbus_codegen( 'ev-daemon-gdbus-generated', 'ev-daemon-gdbus.xml', @@ -124,17 +126,13 @@ if get_option('enable_dbus') object_manager: true, ) - shell_sources += dbus_generated - - atrild_sources = [ - 'ev-daemon.c', - ] - - atrild_sources += dbus_daemon_generated + # Create the daemon executable + # Use a custom_target to ensure the generated files are properly compiled + daemon_sources = ['ev-daemon.c', 'ev-daemon-gdbus-generated.c', 'ev-daemon-gdbus-generated.h'] executable( 'atrild', - atrild_sources, + sources: daemon_sources, include_directories: include_dirs, dependencies: atril_deps, c_args: c_args, |