[glib/script-enum: 91/91] Fix review feedback

[Matthias Clasen <matthiasc src gnome org>]

commit 5d78eb6bb61e31a835aeb5a682a9b04102c82874
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Nov 27 17:06:29 2018 -0500

    Fix review feedback

 docs/reference/gobject/meson.build  | 3 ++-
 gobject/gobjectenumtypes.h.template | 2 +-
 gobject/meson.build                 | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index 7a7f1b81d..6f07a79f3 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -6,7 +6,8 @@ if get_option('gtk_doc')
     'gatomicarray.h',
     'gobject_probes.h',
     'gobject_trace.h',
-    'gtype-private.h'
+    'gtype-private.h',
+    'gobjectenumtypes.h'
   ]
 
   ignore_decorators = [
diff --git a/gobject/gobjectenumtypes.h.template b/gobject/gobjectenumtypes.h.template
index dd003526f..2a4b0e4f3 100644
--- a/gobject/gobjectenumtypes.h.template
+++ b/gobject/gobjectenumtypes.h.template
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GLIB_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_2_60 GType @enum_name@_get_type (void) G_GNUC_CONST;
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 
diff --git a/gobject/meson.build b/gobject/meson.build
index 95b5eed59..f50f356bf 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -85,6 +85,8 @@ foreach tool: python_tools
   meson.override_find_program(tool, tool_bin)
 endforeach
 
+# 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',
   output : 'gobjectenumtypes.h',
   capture : true,
@@ -107,14 +109,14 @@ gobjectenumtypes_c = custom_target('gobjectenumtypes_c',
 gobjectenumtypes_dep = declare_dependency(sources : [gobjectenumtypes_c])
 
 libgobject = library('gobject-2.0',
-  gobjectenumtypes_c,
+  gobjectenumtypes_h, gobjectenumtypes_c,
   gobject_dtrace_obj, gobject_dtrace_hdr,
   gobject_sources,
   version : library_version,
   soversion : soversion,
   darwin_versions : darwin_versions,
   install : true,
-  include_directories : [configinc],
+  include_directories : [configinc, gobjectinc],
   dependencies : [libffi_dep, libglib_dep],
   c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args,
   link_args : glib_link_flags,