diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-09-13 14:36:44 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-10-01 09:49:33 +0200 |
| commit | 95abecb24d5621f56e48203b5d4fe5b9f9a0e446 (patch) | |
| tree | 41c65883b2f1129d97bd7cbc44399e4614900b82 | |
| parent | 23b4dc5f77bb854e57ec2de07ed608f2a916a101 (diff) | |
meson: Make use of gnome.mkenums_simple
There are different enum files created that make use of different
template files. However, `mkenums_simple` method allows the creation
of the same enum files without the need of template files.
The creation of the `nm-core-enum-types` and
`nm-core-tests-enum-types` use now `mkenums_simple` so template
files are now unnecessary.
| -rw-r--r-- | libnm-core/meson.build | 4 | ||||
| -rw-r--r-- | libnm-core/tests/meson.build | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 0060bed140..4c72590e7b 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -75,12 +75,10 @@ libnm_core_headers = files( enum_types = 'nm-core-enum-types' -libnm_core_enum_sources = gnome.mkenums( +libnm_core_enum_sources = gnome.mkenums_simple( enum_types, sources: libnm_core_headers + [nm_version_macro_header], identifier_prefix: nm_id_prefix, - c_template: enum_types + '.c.template', - h_template: enum_types + '.h.template', install_header: true, install_dir: libnm_pkgincludedir, ) diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index f91fb6ab11..292eeaa015 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -9,12 +9,10 @@ enum_types = 'nm-core-tests-enum-types' -enum_sources = gnome.mkenums( +enum_sources = gnome.mkenums_simple( enum_types, sources: 'test-general-enums.h', identifier_prefix: nm_id_prefix, - c_template: enum_types + '.c.template', - h_template: enum_types + '.h.template', ) deps = [ |