Re: [PATCH 2/2] build: Fixed gir build rules

[Bastien Nocera <hadess hadess net>]

On Mon, 2010-09-27 at 20:14 +0200, Víctor M. Jáquez L. wrote:
> On Wed, Sep 22, 2010 at 04:46:01PM +0200, Simón Pena wrote:
> > Updated gir build rules so that they depend on the current version,
> > instead of "0_1". For that, a GRL_MAJORMINOR_NORM has been created.
> > ---
> >  configure.ac    |    2 ++
> >  src/Makefile.am |    8 ++++----
> >  2 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index bcc0eb5..a5339fa 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -49,7 +49,9 @@ GNOME_MAINTAINER_MODE_DEFINES
> >  # ABI version
> >  
> >  GRL_MAJORMINOR=grl_major_version.grl_minor_version
> > +GRL_MAJORMINOR_NORM=grl_major_version[_]grl_minor_version
> >  AC_SUBST(GRL_MAJORMINOR)
> > +AC_SUBST(GRL_MAJORMINOR_NORM)
> >  AC_DEFINE_UNQUOTED(GRL_MAJORMINOR, "$GRL_MAJORMINOR", [library major.minor version])
> >  
> >  # Framework name (contains ABI version)
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index 1708025..f4235d2 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -94,10 +94,10 @@ introspection_sources = \
> >  	$(lib GRL_NAME@_la_SOURCES)
> >  
> >  Grl- GRL_MAJORMINOR@.gir: lib GRL_NAME@.la
> > -Grl_0_1_gir_INCLUDES = GObject-2.0 GModule-2.0
> > -Grl_0_1_gir_CFLAGS = $(lib GRL_NAME@_la_CFLAGS)
> > -Grl_0_1_gir_LIBS = lib GRL_NAME@.la
> > -Grl_0_1_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
> > +Grl_ GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 GModule-2.0
> > +Grl_ GRL_MAJORMINOR_NORM@_gir_CFLAGS = $(lib GRL_NAME@_la_CFLAGS)
> > +Grl_ GRL_MAJORMINOR_NORM@_gir_LIBS = lib GRL_NAME@.la
> > +Grl_ GRL_MAJORMINOR_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
> >  INTROSPECTION_GIRS += Grl- GRL_MAJORMINOR@.gir
> >  
> >  girdir = $(datadir)/gir-1.0
> 
> I've been reticent to push this patch just because I haven't see this pattern
> in any other project, but I can't foresee the reason.
> 
> Can somebody shed a light on this?

Looks fine to me, if you're going to bump ABI often.