[glom] Use GLOM_ABI_VERSION in Makefiles and configure.ac

[David King <davidk src gnome org>]

commit b28cf07728722b9aa34d29b3268328b2ed58b7df
Author: David King <davidk openismus com>
Date:   Fri Sep 10 14:12:02 2010 +0200

    Use GLOM_ABI_VERSION in Makefiles and configure.ac
    
    * Makefile.am:
    * Makefile_libglom.am:
    * configure.ac: Use GLOM_ABI_VERSION to reduce duplication.

 ChangeLog           |    8 ++++++++
 Makefile.am         |   12 ++++++------
 Makefile_libglom.am |    8 ++++----
 configure.ac        |    2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dc756ed..3cde50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-10  David King  <davidk openismus com>
+
+	Use GLOM_ABI_VERSION in Makefiles and configure.ac
+
+	* Makefile.am:
+	* Makefile_libglom.am:
+	* configure.ac: Use GLOM_ABI_VERSION to reduce duplication.
+
 2010-09-10  Murray Cumming  <murrayc murrayc com>
 
 	Use libosso instead of libossomm on Maemo
diff --git a/Makefile.am b/Makefile.am
index e0470ac..4d7f892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,18 +55,18 @@ endif
 SUFFIXES = .rc .res
 
 bin_PROGRAMS = glom/glom
-lib_LTLIBRARIES = glom/libglom/libglom-1.16.la
-pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_16.la
+lib_LTLIBRARIES = glom/libglom/libglom- GLOM_ABI_VERSION@.la
+pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_ GLOM_ABI_VERSION@.la
 
 include Makefile_libglom.am
 include Makefile_glom.am
 include Makefile_tests.am
 
-glom_python_embed_python_module_glom_1_16_la_SOURCES =		\
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_SOURCES = \
 	glom/python_embed/python_module/py_glom_module.cc	\
 	glom/python_embed/python_module/py_glom_module.h
 
-glom_python_embed_python_module_glom_1_16_la_LIBADD = \
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_LIBADD = \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
 	$(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 
@@ -76,10 +76,10 @@ else
 pymod_ldflags = -module -avoid-version -no-undefined
 endif
 glom_pyexport = -export-symbols-regex '^_*initglom'
-glom_python_embed_python_module_glom_1_16_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
+glom_python_embed_python_module_glom_ GLOM_ABI_VERSION@_la_LDFLAGS = $(pymod_ldflags) $(glom_pyexport)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glom/libglom/glom-1.16.pc
+pkgconfig_DATA = glom/libglom/glom- GLOM_ABI_VERSION@.pc
 
 dist_pkgdata_DATA = glom/glom_document.dtd
 
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index e0a0260..37c6b81 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -38,9 +38,9 @@ libglom_d_bakery_include_HEADERS = $(libglom_d_bakery_headers)
 libglom_d_b_view_includedir = $(libglom_d_bakery_includedir)/view
 libglom_d_b_view_include_HEADERS = $(libglom_d_b_view_headers)
 
-glom_libglom_libglom_1_16_la_SOURCES = $(libglom_sources)
-glom_libglom_libglom_1_16_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES = $(libglom_sources)
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD  = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 if HOST_WIN32
-glom_libglom_libglom_1_16_la_LIBADD += -lws2_32
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD += -lws2_32
 endif
-glom_libglom_libglom_1_16_la_LDFLAGS = -no-undefined
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LDFLAGS = -no-undefined
diff --git a/configure.ac b/configure.ac
index 909a2f8..0c8840b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,7 @@ AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile
                  po/Makefile.in
                  glom.desktop.in
-                 glom/libglom/glom-1.16.pc
+                 glom/libglom/glom-$(GLOM_ABI_VERSION).pc
                  docs/libglom_reference/Makefile
                  docs/libglom_reference/Doxyfile
                  docs/pyglom_reference/Makefile