build: Rename gobjectenumtypes.[ch] to glib-enumtypes.[ch]

To reflect the fact that they contain the GObject types for various
enums defined in libglib.

See https://gitlab.gnome.org/GNOME/glib/merge_requests/481#note_451086.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: GNOME/gobject-introspection#267

docs/reference/gobject/meson.build

@@ -7,7 +7,7 @@ if get_option('gtk_doc')
     'gobject_probes.h',
     'gobject_trace.h',
     'gtype-private.h',
-    'gobjectenumtypes.h'
+    'glib-enumtypes.h',
   ]
 
   ignore_decorators = [

gio/meson.build

@@ -754,7 +754,7 @@ gioenumtypes_c = custom_target('gioenumtypes_c',
              '--template', files('gioenumtypes.c.template'),
              '@INPUT@', gnetworking_h])
 
-gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, gobjectenumtypes_h])
+gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])
 
 # inotify
 if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1

glib/glib-object.h

@@ -34,7 +34,7 @@
 #include <gobject/gvalue.h>
 #include <gobject/gvaluearray.h>
 #include <gobject/gvaluetypes.h>
-#include <gobject/gobjectenumtypes.h>
+#include <gobject/glib-enumtypes.h>
 
 #include <gobject/gobject-autocleanups.h>
 

gobject/glib-enumtypes.c.template

@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
 #include "config.h"
-#include "gobjectenumtypes.h"
+#include "glib-enumtypes.h"
 #include <glib-object.h>
 
 /*** END file-header ***/

gobject/meson.build

@@ -85,33 +85,41 @@ foreach tool: python_tools
   meson.override_find_program(tool, tool_bin)
 endforeach
 
+# Generate a header file containing the GObject enum types for the enums defined
+# in libglib.
+#
+# For now, we only include gunicode.h here, since GScriptType is needed for
+# Pango. More headers can be added as needed in future.
+#
 # We can't use gnome.mkenums() because the GNOME module looks for glib-mkenums
 # in PATH, which means you can't bootstrap glib with its own glib-mkenums.
-gobjectenumtypes_h = custom_target('gobjectenumtypes_h',
+glib_enumtypes_input_headers = files(
-  output : 'gobjectenumtypes.h',
+  '../glib/gunicode.h',
+)
+
+glib_enumtypes_h = custom_target('glib_enumtypes_h',
+  output : 'glib-enumtypes.h',
   capture : true,
-  input : '../glib/gunicode.h',
+  input : glib_enumtypes_input_headers,
   install : true,
   install_dir : join_paths(get_option('includedir'), 'glib-2.0/gobject'),
   command : [python, glib_mkenums,
-             '--template', files('gobjectenumtypes.h.template'),
+             '--template', files('glib-enumtypes.h.template'),
              '@INPUT@'])
 
-# For now, we only include gunicode.h here, since GScriptType is needed for pango
+glib_enumtypes_c = custom_target('glib_enumtypes_c',
-# More headers can be added as needed
+  output : 'glib-enumtypes.c',
-gobjectenumtypes_c = custom_target('gobjectenumtypes_c',
-  output : 'gobjectenumtypes.c',
   capture : true,
-  input : '../glib/gunicode.h',
+  input : glib_enumtypes_input_headers,
-  depends : [gobjectenumtypes_h],
+  depends : [glib_enumtypes_h],
   command : [python, glib_mkenums,
-             '--template', files('gobjectenumtypes.c.template'),
+             '--template', files('glib-enumtypes.c.template'),
              '@INPUT@'])
 
-gobjectenumtypes_dep = declare_dependency(sources : [gobjectenumtypes_h])
+glib_enumtypes_dep = declare_dependency(sources : [glib_enumtypes_h])
 
 libgobject = library('gobject-2.0',
-  gobject_dtrace_obj, gobject_dtrace_hdr, gobjectenumtypes_h, gobjectenumtypes_c,
+  gobject_dtrace_obj, gobject_dtrace_hdr, glib_enumtypes_h, glib_enumtypes_c,
   sources : gobject_sources,
   version : library_version,
   soversion : soversion,
@@ -134,7 +142,7 @@ pkg.generate(libgobject,
 
 libgobject_dep = declare_dependency(link_with : libgobject,
   include_directories : [gobjectinc],
-  dependencies : [libglib_dep, gobjectenumtypes_dep])
+  dependencies : [libglib_dep, glib_enumtypes_dep])
 
 executable('gobject-query', 'gobject-query.c',
   install : true,