From 407981ec8789a401d402f778a0e99395f521ed10 Mon Sep 17 00:00:00 2001 From: Armin Luntzer <armin.luntzer@univie.ac.at> Date: Thu, 25 Jun 2020 11:20:51 +0200 Subject: [PATCH] fix generated vapi: the generator takes header names generated by the introspection scanner for the c includes, which is incorrect changes: * make gtknode.h include all other relevant headers * add explicit c include to introspection scanner arg * change naming of vapi file to be in line with gio/headers/pkgfile --- introspection/Makefile.am | 5 ++++- src/gtknode.h | 1 + vapi/Makefile.am | 14 +++++++------- vapi/{libgtknodes.deps => gtknodes.deps} | 0 4 files changed, 12 insertions(+), 8 deletions(-) rename vapi/{libgtknodes.deps => gtknodes.deps} (100%) diff --git a/introspection/Makefile.am b/introspection/Makefile.am index c41e81a..e457d53 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -1,6 +1,9 @@ INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir)/src --warn-all +INTROSPECTION_SCANNER_ARGS = \ + --c-include=gtknode.h \ + --add-include-path=$(top_srcdir)/src \ + --warn-all INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src if HAVE_INTROSPECTION diff --git a/src/gtknode.h b/src/gtknode.h index 1ac93a8..e21f2eb 100644 --- a/src/gtknode.h +++ b/src/gtknode.h @@ -29,6 +29,7 @@ #error "Only <gtk/gtk.h> can be included directly." #endif +#include <gtknodeview.h> #include <gtknodesocket.h> #include <gtk/gtkbox.h> diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 8f9abfa..3f1f110 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -1,15 +1,15 @@ -VAPIGEN_VAPIS = libgtknodes.vapi +VAPIGEN_VAPIS = gtknodes.vapi if ENABLE_VAPIGEN include $(VAPIGEN_MAKEFILE) -libgtknodes.vapi: $(top_builddir)/introspection/GtkNodes-0.1.gir libgtknodes.deps +gtknodes.vapi: $(top_builddir)/introspection/GtkNodes-0.1.gir gtknodes.deps -libgtknodes_vapi_METADATADIRS = $(srcdir) -libgtknodes_vapi_FILES = $(top_builddir)/introspection/GtkNodes-0.1.gir -libgtknodes_vapi_VAPIDIRS = $(builddir) -libgtknodes_vapi_DEPS = glib-2.0 gio-2.0 gtk+-3.0 +gtknodes_vapi_METADATADIRS = $(srcdir) +gtknodes_vapi_FILES = $(top_builddir)/introspection/GtkNodes-0.1.gir +gtknodes_vapi_VAPIDIRS = $(builddir) +gtknodes_vapi_DEPS = glib-2.0 gio-2.0 gtk+-3.0 vapidir = $(datadir)/vala/vapi vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) @@ -18,4 +18,4 @@ endif CLEANFILES = $(VAPIGEN_VAPIS) EXTRA_DIST = \ - libgtknodes.deps + gtknodes.deps diff --git a/vapi/libgtknodes.deps b/vapi/gtknodes.deps similarity index 100% rename from vapi/libgtknodes.deps rename to vapi/gtknodes.deps -- GitLab