From 883f7ccd94ddb6f69e0ef14eb7525dd6754a2679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 20 Sep 2018 10:03:08 -0500
Subject: meson: use gnome.mkenums_simple for generated types

---
 libwnck/meson.build | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/libwnck/meson.build b/libwnck/meson.build
index b01ea2c..5b26fca 100644
--- a/libwnck/meson.build
+++ b/libwnck/meson.build
@@ -55,44 +55,12 @@ a11y_sources = [
   'workspace-accessible-factory.h',
 ]
 
-enum_types = []
-enum_types += gnome.mkenums(
-  'wnck-enum-types.h',
-  sources: headers,
-  fhead: '''#if !defined (__LIBWNCK_H_INSIDE__) && !defined (WNCK_COMPILATION)
-#error "Only <libwnck/libwnck.h> can be included directly."
-#endif
-#ifndef __WNCK_ENUM_TYPES_H__
-#define __WNCK_ENUM_TYPES_H__
-G_BEGIN_DECLS''',
-  ftail: '''G_END_DECLS
-#endif /* __WNCK_ENUM_TYPES_H__ */''',
-  eprod: '''#define WNCK_TYPE_@ENUMSHORT@ @enum_name@_get_type()
-GType @enum_name@_get_type (void);''',
+enum_types = gnome.mkenums_simple('wnck-enum-types',
+  sources : headers,
   install_header: true,
   install_dir: libwnck_includedir
 )
 
-enum_types += gnome.mkenums(
-  'wnck-enum-types.c',
-  sources: headers,
-  fhead: '#include <libwnck/libwnck.h>',
-  fprod: '/* enumerations from "@filename@" */',
-  vhead: 'static const G@Type@Value _@enum_name@_values[] = {',
-  vprod: '{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
-  vtail: '''{ 0, NULL, NULL }
-};
-
-GType
-@enum_name@_get_type (void)
-{
-      static GType type = 0;
-      if (!type)
-        type = g_@type@_register_static ("@EnumName@", _@enum_name@_values);
-      return type;
-}'''
-)
-
 resources = gnome.compile_resources(
   '@0@-resources'.format(meson.project_name()),
   'wnck.gresource.xml',
-- 
cgit v1.2.1