[dconf/wip/inigomartinez/meson: 6/14] build: Remove config.h definitions
- From: Iñigo Martínez <inigomartinez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf/wip/inigomartinez/meson: 6/14] build: Remove config.h definitions
- Date: Wed, 11 Apr 2018 07:57:40 +0000 (UTC)
commit 521fe315222573250f60a40b975d341fb358e4cb
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Tue Apr 10 07:24:21 2018 +0200
build: Remove config.h definitions
Although many files include the `config.h` file, no defitions are
used at all. Due to this, all the definitions have been removed.
However, the `config.h` file is still generated and included in many
files, as it may be useful for future global definitions.
https://bugzilla.gnome.org/show_bug.cgi?id=790236
meson.build | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/meson.build b/meson.build
index e0dc7b1..0f42e46 100644
--- a/meson.build
+++ b/meson.build
@@ -29,25 +29,6 @@ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
cc = meson.get_compiler('c')
valac = meson.get_compiler('vala')
-config_h = configuration_data()
-
-# package
-set_defines = [
- ['PACKAGE', meson.project_name()],
- ['PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=dconf'],
- ['PACKAGE_NAME', meson.project_name()],
- ['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), dconf_version)],
- ['PACKAGE_TARNAME', meson.project_name()],
- ['PACKAGE_URL', 'https://wiki.gnome.org/Projects/dconf'],
- ['PACKAGE_VERSION', dconf_version],
- ['VERSION', dconf_version],
- ['GETTEXT_PACKAGE', meson.project_name()]
-]
-
-foreach define: set_defines
- config_h.set_quoted(define[0], define[1])
-endforeach
-
# compiler flags
common_flags = []
@@ -73,7 +54,7 @@ dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_
configure_file(
output: 'config.h',
- configuration: config_h
+ configuration: configuration_data()
)
gnome = import('gnome')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]