From 145eca289a9e1d13917327fdc91ec772b05599f4 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 20 Jul 2017 18:12:43 +1000 Subject: [PATCH] meson: use gnome.mkenums_simple() to generate core enumtypes --- Makefile.am | 1 - gst/meson.build | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a47315d..ae38d94 100644 --- 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 --- 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 ', + body_prefix : '#include "gst/gst_private.h"\n#include ', + decorator : 'GST_API', install_header : true, install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst')) -- 2.7.4