[gssdp] build: Do not make config.h part of the dependency
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gssdp] build: Do not make config.h part of the dependency
- Date: Sat, 19 Jun 2021 16:31:57 +0000 (UTC)
commit f115fee37f31d65de5b1f2c570b6fd0105ab267d
Author: Jens Georg <mail jensge org>
Date: Sat Jun 19 18:31:32 2021 +0200
build: Do not make config.h part of the dependency
internal/meson.build | 5 +----
libgssdp/gssdp-client.c | 4 +---
libgssdp/meson.build | 2 +-
meson.build | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/internal/meson.build b/internal/meson.build
index 583ce8f..43f0ccc 100644
--- a/internal/meson.build
+++ b/internal/meson.build
@@ -1,5 +1,2 @@
config_h = configure_file(output : 'config.h', configuration : conf)
-config_header = declare_dependency(
- compile_args : '-DHAVE_CONFIG_H=1',
- include_directories: include_directories('.')
-)
+config_h_inc = include_directories('.')
diff --git a/libgssdp/gssdp-client.c b/libgssdp/gssdp-client.c
index be36f79..a733659 100644
--- a/libgssdp/gssdp-client.c
+++ b/libgssdp/gssdp-client.c
@@ -26,11 +26,9 @@
#define G_LOG_DOMAIN "gssdp-client"
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif /* HAVE_CONFIG_H */
-#include <gio/gio.h>
+#include <gio/gio.h>
#include "gssdp-client.h"
#include "gssdp-client-private.h"
diff --git a/libgssdp/meson.build b/libgssdp/meson.build
index 7fd8b4c..dcebe1a 100644
--- a/libgssdp/meson.build
+++ b/libgssdp/meson.build
@@ -61,7 +61,7 @@ libgssdp = library('gssdp-1.2', sources + enums,
version : version,
darwin_versions : darwin_versions,
dependencies : dependencies + system_deps,
- include_directories : include_directories('..'),
+ include_directories : [include_directories('..'), config_h_inc],
install : true)
gssdp = declare_dependency(link_with : libgssdp,
diff --git a/meson.build b/meson.build
index 7e9ad13..e88980c 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ conf.set('HAVE_SIOCGIFINDEX', siocgifindex_available)
subdir('internal')
-system_deps = [config_header]
+system_deps = []
# Check whether we are compiling against Android libc
bionic_test = '''#include <sys/cdefs.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]