diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-07-29 22:51:42 +0200 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2019-08-05 21:19:38 +0000 |
commit | 888edf45f8bd2ae6a72750ff9bfaef856f403fa7 (patch) | |
tree | 0956092e37c23924b7cf713af053d676930a4dbf /libcheese | |
parent | d88ad7314209b3413e52fcdb92901e488d5bf6a4 (diff) | |
download | cheese-888edf45f8bd2ae6a72750ff9bfaef856f403fa7.tar.gz |
build: Simplify enum generation
meson has an alternative way to generate simple enum files without
using template files.
`mkenums` has been replaced by `mkenums_simple` that allows avoiding
template files.
Diffstat (limited to 'libcheese')
-rw-r--r-- | libcheese/cheese-enums.c.template | 42 | ||||
-rw-r--r-- | libcheese/cheese-enums.h.template | 25 | ||||
-rw-r--r-- | libcheese/meson.build | 8 |
3 files changed, 2 insertions, 73 deletions
diff --git a/libcheese/cheese-enums.c.template b/libcheese/cheese-enums.c.template deleted file mode 100644 index 011816f1..00000000 --- a/libcheese/cheese-enums.c.template +++ /dev/null @@ -1,42 +0,0 @@ -/*** BEGIN file-header ***/ -#include "cheese-enums.h" - -/*** END file-header ***/ - -/*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ -#include "@filename@" -/*** END file-production ***/ - - -/*** BEGIN value-header ***/ -GType -@enum_name@_get_type (void) -{ - static GType type = 0; - - if (!type) - { - static const G@Type@Value _@enum_name@_values[] = { -/*** END value-header ***/ - -/*** BEGIN value-production ***/ - { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, -/*** END value-production ***/ - -/*** BEGIN value-tail ***/ - { 0, NULL, NULL } - }; - - type = g_@type@_register_static ("@EnumName@", _@enum_name@_values); - } - - return type; -} - - -/*** END value-tail ***/ - -/*** BEGIN file-tail ***/ - -/*** END file-tail ***/ diff --git a/libcheese/cheese-enums.h.template b/libcheese/cheese-enums.h.template deleted file mode 100644 index bcac735a..00000000 --- a/libcheese/cheese-enums.h.template +++ /dev/null @@ -1,25 +0,0 @@ -/*** BEGIN file-header ***/ - -#ifndef CHEESE_ENUMS_H_ -#define CHEESE_ENUMS_H_ - -#include <glib-object.h> - -G_BEGIN_DECLS -/*** END file-header ***/ - -/*** BEGIN file-production ***/ - -/* enumerations from "@filename@" */ -/*** END file-production ***/ - -/*** BEGIN value-header ***/ -GType @enum_name@_get_type (void) G_GNUC_CONST; -#define CHEESE_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) -/*** END value-header ***/ - -/*** BEGIN file-tail ***/ -G_END_DECLS - -#endif /* CHEESE_ENUMS_H_ */ -/*** END file-tail ***/ diff --git a/libcheese/meson.build b/libcheese/meson.build index a326329a..851ef93e 100644 --- a/libcheese/meson.build +++ b/libcheese/meson.build @@ -107,13 +107,9 @@ sources = um_crop_area_source + files( 'totem-aspect-frame.c', ) -enum_types = 'cheese-enums' - -enum_sources = gnome.mkenums( - enum_types, +enum_sources = gnome.mkenums_simple( + 'cheese-enums', sources: enum_headers, - c_template: enum_types + '.c.template', - h_template: enum_types + '.h.template', ) deps = [ |