[gegl] gobject-introspection: Fix build after 0.2.x version bump
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] gobject-introspection: Fix build after 0.2.x version bump
- Date: Thu, 12 Apr 2012 12:41:53 +0000 (UTC)
commit 35469116fbf0b398d748f8116e4dcc8bdaee12c7
Author: Jon Nordby <jononor gmail com>
Date: Thu Apr 12 14:10:05 2012 +0200
gobject-introspection: Fix build after 0.2.x version bump
Remove hardcoding of version numbers so that this does
not happen again.
configure.ac | 1 +
gegl/.gitignore | 1 +
gegl/Makefile.am | 8 ++++----
gegl/{gegl-0.1.deps => gegl.deps.in} | 0
4 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a2871bc..8102835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1119,6 +1119,7 @@ gegl-uninstalled.pc
# Files with versions in their names
AC_CONFIG_FILES(
gegl-gegl_api_version.pc:gegl.pc.in
+gegl/gegl-gegl_api_version.deps:gegl/gegl.deps.in
)
AC_OUTPUT
diff --git a/gegl/.gitignore b/gegl/.gitignore
index cefd0e8..7836a1f 100644
--- a/gegl/.gitignore
+++ b/gegl/.gitignore
@@ -9,4 +9,5 @@
/*.gir
/*.typelib
/*.vapi
+/*.deps
/gegl-enums.c
diff --git a/gegl/Makefile.am b/gegl/Makefile.am
index aef4c33..43010ce 100644
--- a/gegl/Makefile.am
+++ b/gegl/Makefile.am
@@ -118,10 +118,10 @@ introspection_sources = \
INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
Gegl- GEGL_API_VERSION@.gir: libgegl- GEGL_API_VERSION@.la Makefile
-Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
-Gegl_0_1_gir_CFLAGS = $(INCLUDES)
-Gegl_0_1_gir_LIBS = libgegl- GEGL_API_VERSION@.la
-Gegl_0_1_gir_FILES = $(introspection_sources)
+Gegl_ GEGL_MAJOR_VERSION@_ GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+Gegl_ GEGL_MAJOR_VERSION@_ GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
+Gegl_ GEGL_MAJOR_VERSION@_ GEGL_MINOR_VERSION@_gir_LIBS = libgegl- GEGL_API_VERSION@.la
+Gegl_ GEGL_MAJOR_VERSION@_ GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += Gegl- GEGL_API_VERSION@.gir
girdir = $(datadir)/gir-1.0
diff --git a/gegl/gegl-0.1.deps b/gegl/gegl.deps.in
similarity index 100%
rename from gegl/gegl-0.1.deps
rename to gegl/gegl.deps.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]