[gnome-shell] build: Use new mkenums_simple() function

[Florian Müllner <fmuellner src gnome org>]

commit ab0e98dfdd49d73373eb4367a299593b96211f80
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Aug 15 21:54:48 2017 +0200

    build: Use new mkenums_simple() function
    
    As most libraries use the same mkenums templates, meson now added a
    mkenums_simple() variant that works without providing the template.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=786343

 src/meson.build           |    6 ++----
 src/shell-enum-types.c.in |   30 ------------------------------
 src/shell-enum-types.h.in |   25 -------------------------
 src/st/meson.build        |    8 +++++---
 src/st/st-enum-types.c.in |   33 ---------------------------------
 src/st/st-enum-types.h.in |   29 -----------------------------
 6 files changed, 7 insertions(+), 124 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 1e88bf5..3e55573 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -182,10 +182,8 @@ if enable_recorder
 endif
 
 
-libshell_enums = gnome.mkenums('shell-enum-types',
-  sources: libshell_public_headers,
-  c_template: 'shell-enum-types.c.in',
-  h_template: 'shell-enum-types.h.in'
+libshell_enums = gnome.mkenums_simple('shell-enum-types',
+  sources: libshell_public_headers
 )
 
 libshell_gir_sources = [
diff --git a/src/st/meson.build b/src/st/meson.build
index 46378a2..fa9d6bb 100644
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -82,10 +82,12 @@ st_sources = [
   'st-widget.c'
 ]
 
-st_enums = gnome.mkenums('st-enum-types',
+st_enums = gnome.mkenums_simple('st-enum-types',
   sources: st_headers,
-  c_template: 'st-enum-types.c.in',
-  h_template: 'st-enum-types.h.in'
+  header_prefix: '''
+#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
+#error "Only <st/st.h> can be included directly.h"
+#endif'''
 )
 
 st_gir_sources = st_sources + st_private_headers + st_headers + st_enums