[gxml/serialization] Preparation for parallel installation of GXml 0.4

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 3a5ffaa8f64fb8af7769c7290d3e0edd56dfb7d3
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Feb 1 02:53:51 2014 -0600

    Preparation for parallel installation of GXml 0.4

 configure.ac                        |    8 +++---
 gxml/Makefile.am                    |   38 +++++++++++++++++-----------------
 gxml/{gxml.pc.in => gxml-0.4.pc.in} |    6 ++--
 3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 44e9b3b..ee7c326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,8 @@ m4_define([project_nano_version], [0])
 #     increment current and set revision to 0
 #   If public symbols have been added since last release, increment age
 #   If public symbols have been removed since last release, set age to 0
-m4_define([project_lt_current], [3])
-m4_define([project_lt_revision], [1])
+m4_define([project_lt_current], [4])
+m4_define([project_lt_revision], [0])
 m4_define([project_lt_age], [0])
 
 # Combine numbers to various version variables (different uses)
@@ -52,7 +52,7 @@ AC_INIT([GXml], project_version,
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_PREREQ([2.65])
-AC_COPYRIGHT([Copyright (C) 2012 Richard Schwarting])
+AC_COPYRIGHT([Copyright (C) 2012 Richard Schwarting, 2013, 2014 (C) Daniel Espinosa])
 
 # Configure various files and settings for autoconf/automake
 AC_CONFIG_MACRO_DIR([m4])
@@ -167,7 +167,7 @@ AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "x
 ### Autoconf generating Makefiles
 AC_CONFIG_FILES([
 Makefile
-gxml/gxml.pc
+gxml/gxml-0.4.pc
 gxml/Makefile
 test/Makefile
 docs/Makefile
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index d433f76..edd0623 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -26,12 +26,12 @@ AM_CFLAGS = \
 ### Library
 
 # Library to create
-lib_LTLIBRARIES = libgxml.la
+lib_LTLIBRARIES = libgxml-0.4.la
 
 VALAC=valac
 
 # Vala source code
-libgxml_la_SOURCES = \
+libgxml_0_4_la_SOURCES = \
        Attr.vala \
        BackedNode.vala \
        CDATASection.vala \
@@ -65,12 +65,11 @@ libgxml_la_SOURCES = \
        SerializableGeeDualKeyMap.vala \
        SerializableMapDualKey.vala \
        SerializableGeeArrayList.vala \
-       $(NULL) \
        SerializableContainer.vala
 
 # TODO: do we want XPath files in own directory?
 
-gxml.vala.stamp: $(libgxml_la_SOURCES)
+gxml_0_4_la_vala.stamp: $(libgxml_0_4_la_SOURCES)
 
 
 # libgxml_la_SOURCES = \
@@ -79,11 +78,11 @@ gxml.vala.stamp: $(libgxml_la_SOURCES)
 #      $(NULL)
 
 # library flags
-libgxml_la_VALAFLAGS = \
+libgxml__0_4_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --gir=GXml-$(API_VERSION).gir \
-       --library=gxml \
+       --library=gxml-0.4 \
        $(top_srcdir)/vapi/config.vapi \
        --vapidir=. \
        --vapidir=$(top_srcdir)/vapi \
@@ -92,11 +91,11 @@ libgxml_la_VALAFLAGS = \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --includedir gxml \
-       --vapi gxml.vapi \
+       --vapi gxml-0.4.vapi \
        -H gxml.h \
        $(NULL)
 
-libgxml_la_LIBADD = \
+libgxml_0_4_la_LIBADD = \
        $(AM_LDADD) \
        $(GEE_LIBS) \
        $(GIO_LIBS) \
@@ -105,23 +104,24 @@ libgxml_la_LIBADD = \
        $(VALA_LIBS) \
        $(NULL)
 
-libgxml_la_LDFLAGS = \
+libgxml_0_4_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
 
 # .h header file
-gxmldir= $(includedir)/gxml
+gxml.h: libgxml-0.4.la
+gxmldir= $(includedir)/gxml-$(API_VERSION)/gxml
 gxml_HEADERS = gxml.h
 
 # .vapi Vala API file
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
-       gxml.vapi \
+       gxml-0.4.vapi \
        gxml.deps \
        $(NULL)
 
 # .pc pkg-config file
-pkgconfig_in = gxml.pc.in
+pkgconfig_in = gxml-0.4.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
@@ -130,8 +130,8 @@ EXTRA_DIST = \
        $(NULL)
 
 GITIGNOREFILES = \
-       $(libgxml_la_SOURCES:.vala=.c) \
-       libgxml_la_vala.stamp \
+       $(libgxml_0_4_la_SOURCES:.vala=.c) \
+       libgxml_0_4_la_vala.stamp \
        $(NULL)
 
 
@@ -150,14 +150,14 @@ endif
 #   Extract our dlname like libfolks does, see bgo#658002 and bgo#585116
 #   This is what g-ir-scanner does.
 libgxml_dlname = \
-        `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml.la`
+        `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml-0.4.la`
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS =
 INTROSPECTION_COMPILER_ARGS = --includedir=. -l $(libgxml_dlname)
 
-GXml-$(API_VERSION).gir: libgxml.la
+GXml-$(API_VERSION).gir: libgxml-0.4.la
 GIRS = GXml-$(API_VERSION).gir
 
 dist_gir_DATA = $(GIRS)
@@ -167,9 +167,9 @@ nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 
 ### Files to clean
 BUILT_SOURCES = \
-       gxml.vala.stamp \
+       gxml_0_4_la_vala.stamp \
        gxml.h \
-       gxml.vapi \
+       gxml-0.4.vapi \
        $(NULL)
 
 # TODO: should we add *.c to this list?, or is there a var of generated .c we can put in CLEANFILES?
@@ -187,7 +187,7 @@ CLEANFILES = \
        $(typelibs_DATA) \
        $(BUILT_SOURCES) \
        $(nodist_typelib_DATA) \
-       $(libgxml_la_SOURCES:.vala=.c)
+       $(libgxml_0_4_la_SOURCES:.vala=.c)
 
 MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(dist_gir_DATA)
 
diff --git a/gxml/gxml.pc.in b/gxml/gxml-0.4.pc.in
similarity index 64%
rename from gxml/gxml.pc.in
rename to gxml/gxml-0.4.pc.in
index 8238295..00924d3 100644
--- a/gxml/gxml.pc.in
+++ b/gxml/gxml-0.4.pc.in
@@ -9,6 +9,6 @@ Name: libgxml
 Description: GObject API for XML manipulation library
 URL: http://live.gnome.org/XML
 Version: @VERSION@
-Requires: glib-2.0 gee-0.8 libxml-2.0
-Libs: -L${libdir} -lgxml
-Cflags: -I${includedir}
+Requires: glib-2.0 gobject-2.0 gee-0.8 libxml-2.0
+Libs: -L${libdir} -lgxml- API_VERSION@
+Cflags: -I${includedir}/gxml- API_VERSION@