Commit de85342a authored by Michael Biebl's avatar Michael Biebl Committed by Joshua Lock

Use proper typelib versioning

The typelib version should be bumped when the API of the referenced
library changes, so use BRASERO_MAJOR_VERSION.SOVERSION instead of the
package version.

https://bugzilla.gnome.org/show_bug.cgi?id=677732
parent 6540da8d
......@@ -31,6 +31,9 @@ AC_SUBST(LT_AGE)
LIBBRASERO_LT_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE
AC_SUBST(LIBBRASERO_LT_VERSION)
TYPELIB_VERSION=$BRASERO_MAJOR_VERSION.$((LT_CURRENT-LT_AGE))
AC_SUBST(TYPELIB_VERSION)
AC_DEFINE_UNQUOTED(BRASERO_MAJOR_VERSION, $BRASERO_MAJOR_VERSION, [major version])
AC_DEFINE_UNQUOTED(BRASERO_MINOR_VERSION, $BRASERO_MINOR_VERSION, [minor version])
AC_DEFINE_UNQUOTED(BRASERO_SUB, $BRASERO_SUB, [sub version])
......
......@@ -204,12 +204,12 @@ EXTRA_DIST = \
if HAVE_INTROSPECTION
girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = BraseroBurn-@BRASERO_VERSION@.gir
gir_DATA = BraseroBurn-@TYPELIB_VERSION@.gir
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = BraseroBurn-@BRASERO_VERSION@.typelib
typelibs_DATA = BraseroBurn-@TYPELIB_VERSION@.typelib
BraseroBurn-@BRASERO_VERSION@.gir: libbrasero-burn3.la $(INTROSPECTION_SCANNER)
BraseroBurn-@TYPELIB_VERSION@.gir: libbrasero-burn3.la $(INTROSPECTION_SCANNER)
$(INTROSPECTION_SCANNER) -v --namespace=BraseroBurn --nsversion=1.0 \
-I$(top_srcdir)/libbrasero-media \
-I$(top_builddir)/libbrasero-media \
......@@ -217,7 +217,7 @@ BraseroBurn-@BRASERO_VERSION@.gir: libbrasero-burn3.la $(INTROSPECTION_SCANNER)
-I$(top_builddir)/libbrasero-burn \
--include=Gtk-3.0 \
--add-include-path=$(top_builddir)/libbrasero-media \
--include=BraseroMedia-@BRASERO_VERSION@ \
--include=BraseroMedia-@TYPELIB_VERSION@ \
--library=brasero-burn3 \
--libtool="$(LIBTOOL)" \
--output $@ \
......@@ -247,7 +247,7 @@ BraseroBurn-@BRASERO_VERSION@.gir: libbrasero-burn3.la $(INTROSPECTION_SCANNER)
$(top_srcdir)/libbrasero-burn/brasero-sum-dialog.h \
$(top_srcdir)/libbrasero-burn/*.c
BraseroBurn-@BRASERO_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
BraseroBurn-@TYPELIB_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-burn/$(gir_DATA) --shared-library=libbrasero-burn3 -o $(typelibs_DATA) --includedir=$(top_builddir)/libbrasero-media
endif
......
......@@ -152,12 +152,12 @@ endif
if HAVE_INTROSPECTION
girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = BraseroMedia-@BRASERO_VERSION@.gir
gir_DATA = BraseroMedia-@TYPELIB_VERSION@.gir
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
typelibs_DATA = BraseroMedia-@BRASERO_VERSION@.typelib
typelibs_DATA = BraseroMedia-@TYPELIB_VERSION@.typelib
BraseroMedia-@BRASERO_VERSION@.gir: libbrasero-media3.la $(INTROSPECTION_SCANNER)
BraseroMedia-@TYPELIB_VERSION@.gir: libbrasero-media3.la $(INTROSPECTION_SCANNER)
$(INTROSPECTION_SCANNER) -v --namespace=BraseroMedia --nsversion=1.0 \
--include=Gtk-3.0 \
-I$(top_srcdir)/libbrasero-media \
......@@ -176,7 +176,7 @@ BraseroMedia-@BRASERO_VERSION@.gir: libbrasero-media3.la $(INTROSPECTION_SCANNER
$(top_srcdir)/libbrasero-media/brasero-drive-selection.h \
$(top_srcdir)/libbrasero-media/*.c
BraseroMedia-@BRASERO_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
BraseroMedia-@TYPELIB_VERSION@.typelib: $(gir_DATA) $(INTROSPECTION_COMPILER)
$(INTROSPECTION_COMPILER) $(top_builddir)/libbrasero-media/$(gir_DATA) --shared-library=libbrasero-media3 -o $(typelibs_DATA)
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment