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

 
 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

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>
 

vapi/Makefile.am

-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