From 35b43d384626bd7a2037318dc4c2fc1f31e09ea1 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Tue, 21 Sep 2021 20:13:50 +0100
Subject: [PATCH] Revert "Better configuration file handling"
This reverts commit f32b90ec2f6d9fcd7907d60324f08bfa47a362df.
---
meson.build | 16 +++++++++-------
src/main.c | 2 +-
src/meson.build | 3 +--
src/rugby-app-window.c | 2 +-
src/rugby-possibility-widget.c | 2 +-
src/rugby-possibility.c | 2 +-
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index 1ae5ad2..99574da 100644
--- a/meson.build
+++ b/meson.build
@@ -16,14 +16,16 @@ gtk_dep = dependency('gtk4', version: '>= 4.0')
conf = configuration_data()
conf.set_quoted('VERSION','@VCS_TAG@')
-vcs_tag(
- input: configure_file(
- output: 'config.h.in',
- configuration: conf
- ),
- output: 'config.h',
+
+config_h = declare_dependency(
+ sources: vcs_tag(
+ input: configure_file(
+ output: 'config.h.in',
+ configuration: conf
+ ),
+ output: 'config.h',
+ )
)
-configuration_inc = include_directories('.')
cflags = []
cflags += ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46',
diff --git a/src/main.c b/src/main.c
index d94fc32..4642cb0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
+#include "config.h"
#include "rugby-app-window.h"
#include "rugby-pref-window.h"
diff --git a/src/meson.build b/src/meson.build
index 3bb7448..903b613 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,7 +12,6 @@ sources = [
executable('rugby',
sources, resources, compiled_schemas,
- dependencies: [gio_dep, gtk_dep],
- include_directories: configuration_inc,
+ dependencies: [config_h, gio_dep, gtk_dep],
install_dir: get_option('bindir'),
install: true)
diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index ca1b448..7c972fc 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
+#include "config.h"
#include "rugby-app-window.h"
#include "rugby-list-store.h"
diff --git a/src/rugby-possibility-widget.c b/src/rugby-possibility-widget.c
index 4483c9f..94a1c94 100644
--- a/src/rugby-possibility-widget.c
+++ b/src/rugby-possibility-widget.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
+#include "config.h"
#include "rugby-possibility-widget.h"
diff --git a/src/rugby-possibility.c b/src/rugby-possibility.c
index 7bedabe..768a78c 100644
--- a/src/rugby-possibility.c
+++ b/src/rugby-possibility.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
+#include "config.h"
#include "rugby-possibility.h"
struct _RugbyPossibility
--
GitLab