summaryrefslogtreecommitdiff
path: root/libnm-util/meson.build
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2017-12-16 14:59:37 +0100
committerThomas Haller <thaller@redhat.com>2017-12-18 11:25:06 +0100
commit0735b35dd0fe87285f85c0040dfcb53cec2d1bd9 (patch)
tree91f9836bba6c365a24846869317bec15f427c0ac /libnm-util/meson.build
parenta58cde8d2c9595941067be7c79e03ad34463d63a (diff)
downloadNetworkManager-0735b35dd0fe87285f85c0040dfcb53cec2d1bd9.tar.gz
build: use template files for enum types' sources generation
Source files for enum types are generated by passing segments of the source code of the files to the `glib-mkenums` command. This patch removes those parameters where source code is used from meson build files by moving those segmeents to template files. https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00057.html
Diffstat (limited to 'libnm-util/meson.build')
-rw-r--r--libnm-util/meson.build27
1 files changed, 7 insertions, 20 deletions
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index bca88a91e9..eea36367d9 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -43,31 +43,18 @@ install_headers(
subdir: nm_name
)
-enums = 'nm-utils-enum-types'
+enum_types = 'nm-utils-enum-types'
-libnm_utils_enums_h = gnome.mkenums(
- enums + '.h',
+libnm_utils_enum = gnome.mkenums(
+ enum_types,
sources: enums_headers,
identifier_prefix: nm_id_prefix,
- fhead: '/* Generated by glib-mkenums. Do not edit */\n\n#ifndef __NM_UTILS_ENUM_TYPES_H__\n#define __NM_UTILS_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
- vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())\n',
- ftail: 'G_END_DECLS\n\n#endif /* __NM_UTILS_ENUM_TYPES_H__ */',
+ c_template: enum_types + '.c.template',
+ h_template: enum_types + '.h.template',
install_header: true,
install_dir: nm_pkgincludedir
)
-libnm_utils_enums_c = gnome.mkenums(
- enums + '.c',
- sources: enums_headers,
- identifier_prefix: nm_id_prefix,
- fhead: '/* Generated by glib-mkenums. Do not edit */\n\n#include "config.h"\n\n#include "nm-utils-enum-types.h"\n\n#include "nm-version-macros.h" \n#include "nm-connection.h" \n#include "nm-setting.h" \n#include "nm-setting-8021x.h" \n#include "nm-setting-adsl.h" \n#include "nm-setting-bluetooth.h" \n#include "nm-setting-bond.h" \n#include "nm-setting-team.h" \n#include "nm-setting-team-port.h" \n#include "nm-setting-bridge.h" \n#include "nm-setting-bridge-port.h" \n#include "nm-setting-connection.h" \n#include "nm-setting-dcb.h" \n#include "nm-setting-infiniband.h" \n#include "nm-setting-ip4-config.h" \n#include "nm-setting-vlan.h" \n#include "nm-setting-ip6-config.h" \n#include "nm-setting-ppp.h" \n#include "nm-setting-pppoe.h" \n#include "nm-setting-serial.h" \n#include "nm-setting-generic.h" \n#include "nm-setting-gsm.h" \n#include "nm-setting-cdma.h" \n#include "nm-setting-olpc-mesh.h" \n#include "nm-setting-wimax.h" \n#include "nm-setting-wired.h" \n#include "nm-setting-wireless.h" \n#include "nm-setting-wireless-security.h" \n#include "nm-setting-vpn.h" \n#include "nm-utils.h" \n#include "nm-version.h"\n\n',
- vhead: 'GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n\n if (g_once_init_enter (&g_define_type_id__volatile))\n {\n static const G@Type@Value values[] = {\n',
- vprod: ' { @VALUENAME@, "@VALUENAME@", "@valuenick@" },\n',
- vtail: ' { 0, NULL, NULL }\n };\n GType g_define_type_id =\n g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n\n return g_define_type_id__volatile;\n}\n'
-)
-
-libnm_utils_enums = [libnm_utils_enums_c, libnm_utils_enums_h]
-
sources = shared_utils + files(
'crypto.c',
'crypto_' + crypto + '.c',
@@ -132,7 +119,7 @@ endif
libnm_util = shared_library(
'nm-util',
- sources: sources + libnm_utils_enums,
+ sources: sources + libnm_utils_enum,
version: libnm_util_version,
include_directories: incs,
dependencies: deps,
@@ -161,7 +148,7 @@ pkg.generate(
)
if enable_introspection
- gir_sources = sources + headers + libnm_utils_enums
+ gir_sources = sources + headers + libnm_utils_enum
gir_includes = [
'DBusGLib-1.0',