meson: use gnome.mkenums_simple() to generate core enumtypes

diff --git a/Makefile.am b/Makefile.am
index a47315d..ae38d94 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,6 @@ EXTRA_DIST = \
        MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
        scripts/gst-uninstalled \
        $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/gstreamer-*" ) \
-       gst/gstenumtypes.c.template gst/gstenumtypes.h.template \
        meson_options.txt \
        gst/parse/gen_lex.py.in gst/parse/gen_grammar.py.in \
        $(win32)

diff --git a/gst/meson.build b/gst/meson.build
index 9225054..2448249 100644 (file)
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -196,10 +196,11 @@ gst_version_h = configure_file(input : 'gstversion.h.in',
   install_dir : 'include/gstreamer-1.0/gst',
   configuration : version_cdata)
 
-gst_enums = gnome.mkenums('gstenumtypes',
+gst_enums = gnome.mkenums_simple('gstenumtypes',
   sources : gst_headers,
-  h_template : 'gstenumtypes.h.template',
-  c_template : 'gstenumtypes.c.template',
+  header_prefix : '#include <gst/gstconfig.h>',
+  body_prefix : '#include "gst/gst_private.h"\n#include <gst/gst.h>',
+  decorator : 'GST_API',
   install_header : true,
   install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst'))