[gegl] vala: Remove hardcoded API version in .metadata file and correct cheader



commit 201eac284062cfcadececbb5a3e08804cff585ad
Author: Jon Nordby <jononor gmail com>
Date:   Thu Apr 12 17:46:22 2012 +0200

    vala: Remove hardcoded API version in .metadata file and correct cheader
    
    Due to the hardcded API version the .metadata file was ignored
    since the 0.2.0 version bump. Also adds a cheader metadata override,
    so that the generated .vapi has the correct header information.

 configure.ac           |    1 +
 gegl/.gitignore        |    1 +
 gegl/Gegl-0.1.metadata |    1 -
 gegl/Gegl.metadata.in  |    2 ++
 gegl/Makefile.am       |    2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8102835..df935ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,6 +1120,7 @@ gegl-uninstalled.pc
 AC_CONFIG_FILES(
 gegl-gegl_api_version.pc:gegl.pc.in
 gegl/gegl-gegl_api_version.deps:gegl/gegl.deps.in
+gegl/Gegl-gegl_api_version.metadata:gegl/Gegl.metadata.in
 )
 
 AC_OUTPUT
diff --git a/gegl/.gitignore b/gegl/.gitignore
index 7836a1f..c0f3159 100644
--- a/gegl/.gitignore
+++ b/gegl/.gitignore
@@ -10,4 +10,5 @@
 /*.typelib
 /*.vapi
 /*.deps
+/*.metadata
 /gegl-enums.c
diff --git a/gegl/Gegl.metadata.in b/gegl/Gegl.metadata.in
new file mode 100644
index 0000000..364070e
--- /dev/null
+++ b/gegl/Gegl.metadata.in
@@ -0,0 +1,2 @@
+Gegl cheader_filename="gegl.h"
+module_register_type skip
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
index 43010ce..59f8ca7 100644
--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
@@ -134,7 +134,7 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 if HAVE_VALA
 gegl- GEGL_API_VERSION@.vapi: Gegl- GEGL_API_VERSION@.gir
-	$(VAPIGEN) --library=gegl- GEGL_API_VERSION@ Gegl- GEGL_API_VERSION@.gir
+	$(VAPIGEN) --library=gegl- GEGL_API_VERSION@ --metadatadir=./ Gegl- GEGL_API_VERSION@.gir
 
 vapidir=$(datadir)/vala/vapi
 vapi_DATA = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]