From 30d03e37397eb7c0c3ff286416c563d3e06da7bf Mon Sep 17 00:00:00 2001 From: Camden Dixie O'Brien Date: Sun, 23 Feb 2025 10:25:42 +0000 Subject: [PATCH] Move client sources into client/src dir --- client/meson.build | 19 +------------------ client/{ => src}/config.vapi | 0 client/{ => src}/main.vala | 0 client/src/meson.build | 18 ++++++++++++++++++ 4 files changed, 19 insertions(+), 18 deletions(-) rename client/{ => src}/config.vapi (100%) rename client/{ => src}/main.vala (100%) create mode 100644 client/src/meson.build diff --git a/client/meson.build b/client/meson.build index 07ad422..0924001 100644 --- a/client/meson.build +++ b/client/meson.build @@ -10,21 +10,4 @@ add_project_arguments('-w', language: 'c') gtk_dep = dependency('gtk4') -conf = configuration_data() -conf.set_quoted( - 'CONFIG_CERT_DIR', - join_paths(meson.project_source_root(), '..', 'test')) -configure_file( - output: 'config.h', - configuration: conf -) - -exe = executable( - 'study-system-client', - [ - 'main.vala', - 'config.vapi' - ], - dependencies: [gtk_dep], - c_args: ['-w'] -) +subdir('src') diff --git a/client/config.vapi b/client/src/config.vapi similarity index 100% rename from client/config.vapi rename to client/src/config.vapi diff --git a/client/main.vala b/client/src/main.vala similarity index 100% rename from client/main.vala rename to client/src/main.vala diff --git a/client/src/meson.build b/client/src/meson.build new file mode 100644 index 0000000..9f2cd5c --- /dev/null +++ b/client/src/meson.build @@ -0,0 +1,18 @@ +conf = configuration_data() +conf.set_quoted( + 'CONFIG_CERT_DIR', + join_paths(meson.project_source_root(), '..', 'test')) +configure_file( + output: 'config.h', + configuration: conf +) + +exe = executable( + 'study-system-client', + [ + 'config.vapi', + 'main.vala' + ], + dependencies: [gtk_dep], + c_args: ['-w'] +)