Make it build

Fix the circular dependency by moving the generated
headers to gdk/version/, and build that directory
first.

Misc other fixes, such as putting the custom targets
as sources, not depedencies, and using the correct
major version in the generator script.

4 files changed, 23 insertions, 23 deletions

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 2b7804c85e..8cd6eff6e4 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -44,9 +44,6 @@
 #include <gdk/gdkconfig.h>
 #include <gdk/gdkversionmacros.h>
 
-/* Visibility macros; must be included after the two headers above */
-#include <gdk/gdk-visibility.h>
-
 G_BEGIN_DECLS
 
 /**
diff --git a/gdk/meson.build b/gdk/meson.build
index f953b6efcc..a07f914b25 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -110,6 +110,7 @@ gdk_public_headers = files([
   'gdktoplevelsize.h',
   'gdktoplevel.h',
   'gdkdragsurface.h',
+  'gdkversionmacros.h'
 ])
 install_headers(gdk_public_headers, subdir: 'gtk-4.0/gdk/')
 
@@ -146,7 +147,7 @@ gdk_enums = gnome.mkenums_simple('gdkenumtypes',
   sources: gdk_public_headers,
   decorator: 'GDK_AVAILABLE_IN_ALL',
   body_prefix: '#include "config.h"',
-  header_prefix: '#include "gdkversionmacros.h"\n#include "gdk-visibility.h"',
+  header_prefix: '#include "version/gdkversionmacros.h"\n#include "version/gdk-visibility.h"',
   install_dir: gtk_includedir / 'gtk-4.0/gdk',
   install_header: true,
 )
@@ -183,25 +184,6 @@ gdkversion_cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
 gdkversion_cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
 gdkversion_cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
 
-gdkversionmacros_h = custom_target(
-  input: 'gdkversionmacros.h.in',
-  output: 'gdkversionmacros.h',
-  command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'],
-  install: true,
-  install_dir: gtk_includedir / 'gtk-4.0/gdk',
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
-)
-
-gdk_visibility_h = custom_target(
-  output: 'gdk-visibility.h',
-  command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GDK', '@OUTPUT@'],
-  install: true,
-  install_dir: gtk_includedir / 'gtk-4.0/gdk',
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
-)
-
 gdkinc = include_directories('.')
 gdkx11_inc = include_directories('x11')
 gdkwayland_inc = include_directories('wayland')
diff --git a/gdk/gdkversionmacros.h.in b/gdk/version/gdkversionmacros.h.in
index 0aa6348642..0aa6348642 100644
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/version/gdkversionmacros.h.in
diff --git a/gdk/version/meson.build b/gdk/version/meson.build
new file mode 100644
index 0000000000..c140f363b4
--- /dev/null
+++ b/gdk/version/meson.build
@@ -0,0 +1,21 @@
+
+
+gdkversionmacros_h = custom_target(
+  input: 'gdkversionmacros.h.in',
+  output: 'gdkversionmacros.h',
+  command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'],
+  install: true,
+  install_dir: gtk_includedir / 'gtk-4.0/gdk',
+  # FIXME: Not needed with Meson >= 0.64.0
+  install_tag: 'devel',
+)
+
+gdk_visibility_h = custom_target(
+  output: 'gdk-visibility.h',
+  command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GDK', '@OUTPUT@'],
+  install: true,
+  install_dir: gtk_includedir / 'gtk-4.0/gdk',
+  # FIXME: Not needed with Meson >= 0.64.0
+  install_tag: 'devel',
+)
+