[libgdata] [build] Use API version for GIR file

[Philip Withnall <pwithnall src gnome org>]

commit 8f41511b3d8dd02a7f7eaf4284d8223803300aa0
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jan 30 20:14:36 2010 +0000

    [build] Use API version for GIR file
    
    Add an API version variable (currently set to 0.0) for the GIR filename,
    rather than using the release version. The library itself will have the API
    version appended to the name when we reach API version 1.0.

 Makefile.am  |   11 +++++------
 configure.ac |   22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 722f2f4..0004695 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,9 +361,9 @@ EXTRA_DIST += gdata/gdata.symbols
 
 # Introspection
 if HAVE_INTROSPECTION
-gdata/GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir: Makefile gdata/libgdata.la
+gdata/GData-$(GDATA_API_VERSION).gir: Makefile gdata/libgdata.la
 	$(AM_V_GEN)($(INTROSPECTION_SCANNER)						\
-	--namespace GData --nsversion=$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR)	\
+	--namespace GData --nsversion=$(GDATA_API_VERSION)				\
 	--c-include="gdata/gdata.h" --include=libxml2-2.0 --include=Soup-2.4		\
 	--library=gdata/libgdata.la --output $@ --pkg libgdata				\
 	-I$(top_srcdir) -I$(top_srcdir)/gdata						\
@@ -371,7 +371,7 @@ gdata/GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir: Makefile gdata/li
 	$(gdatamediainclude_HEADERS) $(gdatacalendarinclude_HEADERS)			\
 	$(gdatacontactsinclude_HEADERS) $(gdatadocumentsinclude_HEADERS)		\
 	$(gdatapicasawebinclude_HEADERS) $(gdatayoutubeinclude_HEADERS))
-BUILT_GIRSOURCES = gdata/GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir
+BUILT_GIRSOURCES = gdata/GData-$(GDATA_API_VERSION).gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(BUILT_GIRSOURCES)
@@ -380,13 +380,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir
-	$(AM_V_GEN)($(INTROSPECTION_COMPILER) --includedir=gdata --includedir=. $(INTROSPECTION_COMPILER_ARGS) $< -o $@)
+	$(AM_V_GEN)($(INTROSPECTION_COMPILER) --includedir=$(top_srcdir)/gdata --includedir=. $(INTROSPECTION_COMPILER_ARGS) $< -o $@)
 
 CLEANFILES += \
-	$(BUILT_GIRSOURCES)	\
+	$(gir_DATA)	\
 	$(typelibs_DATA)
 
-EXTRA_DIST += introspection.m4
 DISTCHECK_CONFIGURE_FLAGS += --enable-introspection
 endif
 
diff --git a/configure.ac b/configure.ac
index 78acc27..2bc24bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,16 @@
 AC_PREREQ(2.63)
 
-m4_define(gdata_major_version, 0)
-m4_define(gdata_minor_version, 6)
-m4_define(gdata_micro_version, 0)
+# Release version
+m4_define(gdata_version_major, 0)
+m4_define(gdata_version_minor, 6)
+m4_define(gdata_version_minor, 0)
 
-AC_INIT([libgdata],[gdata_major_version.gdata_minor_version.gdata_micro_version],[https://bugzilla.gnome.org/enter_bug.cgi?product=libgdata],
+# API version
+# TODO: This currently isn't used in the library name; once we hit gdata_version_major=1, that should be changed
+m4_define(gdata_api_version_major, 0)
+m4_define(gdata_api_version_minor, 0)
+
+AC_INIT([libgdata],[gdata_version_major.gdata_version_minor.gdata_version_micro],[https://bugzilla.gnome.org/enter_bug.cgi?product=libgdata],
         [libgdata],[http://live.gnome.org/libgdata])
 
 AC_CONFIG_SRCDIR([gdata/gdata.h])
@@ -41,12 +47,14 @@ SOUP_REQS=2.26.1
 GDATA_LT_VERSION=6:0:0
 AC_SUBST(GDATA_LT_VERSION)
 
-GDATA_VERSION_MAJOR=gdata_major_version
-GDATA_VERSION_MINOR=gdata_minor_version
-GDATA_VERSION_MICRO=gdata_micro_version
+GDATA_VERSION_MAJOR=gdata_version_major
+GDATA_VERSION_MINOR=gdata_version_minor
+GDATA_VERSION_MICRO=gdata_version_micro
+GDATA_API_VERSION=gdata_api_version_major.gdata_api_version_minor
 AC_SUBST(GDATA_VERSION_MAJOR)
 AC_SUBST(GDATA_VERSION_MINOR)
 AC_SUBST(GDATA_VERSION_MICRO)
+AC_SUBST(GDATA_API_VERSION)
 
 pkg_modules="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS libsoup-2.4 >= $SOUP_REQS"
 PKG_CHECK_MODULES(GDATA, [$pkg_modules])