[glom/glom-1-14] Use GLOM_ABI_VERSION where possible

[David King <davidk src gnome org>]

commit dff387354ab1585bd63dd1ec4d8bb6b8ed009620
Author: David King <davidk openismus com>
Date:   Fri Sep 10 14:30:48 2010 +0200

    Use GLOM_ABI_VERSION where possible
    
    * Makefile.am:
    * Makefile_libglom.am:
    * configure.ac: Use GLOM_ABI_VERSION to avoid duplication.
    * glom/libglom/glom-1.14.pc.in: Move to glom/libglom/glom.pc.in, which
    will be moved to a versioned file by configure.

 ChangeLog                                    |   10 ++++++++++
 Makefile.am                                  |   12 ++++++------
 Makefile_libglom.am                          |   14 +++++++-------
 configure.ac                                 |    2 +-
 glom/libglom/{glom-1.14.pc.in => glom.pc.in} |    2 +-
 5 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2f81669..f819e0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-10  David King  <davidk openismus com>
+
+	Use GLOM_ABI_VERSION where possible
+
+	* Makefile.am:
+	* Makefile_libglom.am:
+	* configure.ac: Use GLOM_ABI_VERSION to avoid duplication.
+	* glom/libglom/glom-1.14.pc.in: Move to glom/libglom/glom.pc.in, which
+	will be moved to a versioned file by configure.
+
 2010-09-10  Murray Cumming  <murrayc murrayc com>
 
 	Use libosso instead of libossomm on Maemo
diff --git a/Makefile.am b/Makefile.am
index e093022..8cb99ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,18 +50,18 @@ endif
 SUFFIXES = .rc .res
 
 bin_PROGRAMS = glom/glom
-lib_LTLIBRARIES = glom/libglom/libglom-1.14.la
-pyexec_LTLIBRARIES = glom/python_embed/python_module/glom_1_14.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_14_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_14_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)
 
@@ -71,10 +71,10 @@ else
 pymod_ldflags = -module -avoid-version -no-undefined
 endif
 glom_pyexport = -export-symbols-regex '^_*initglom'
-glom_python_embed_python_module_glom_1_14_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.14.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 f00c65b..3c69775 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -85,7 +85,7 @@ libglom_d_b_view_include_HEADERS =				\
 	glom/libglom/document/bakery/view/view_composite.h	\
 	glom/libglom/document/bakery/view/viewbase.h
 
-glom_libglom_libglom_1_14_la_SOURCES =					\
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES =					\
 	glom/libglom/appstate.cc					\
 	glom/libglom/calcinprogress.cc					\
 	glom/libglom/calcinprogress.h					\
@@ -154,25 +154,25 @@ glom_libglom_libglom_1_14_la_SOURCES =					\
 	glom/libglom/python_embed/pygdavalue_conversions.cc		\
 	glom/libglom/python_embed/pygdavalue_conversions.h
 
-glom_libglom_libglom_1_14_la_SOURCES +=				\
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres.cc	\
 	glom/libglom/connectionpool_backends/postgres.h		\
 	glom/libglom/connectionpool_backends/postgres_central.cc\
 	glom/libglom/connectionpool_backends/postgres_central.h
 
 if !GLOM_ENABLE_CLIENT_ONLY
-glom_libglom_libglom_1_14_la_SOURCES +=				\
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres_self.cc	\
 	glom/libglom/connectionpool_backends/postgres_self.h
 endif
 
-glom_libglom_libglom_1_14_la_SOURCES +=				\
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/sqlite.cc		\
 	glom/libglom/connectionpool_backends/sqlite.h
 
-glom_libglom_libglom_1_14_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 if HOST_WIN32
-glom_libglom_libglom_1_14_la_LIBADD += -lws2_32
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LIBADD += -lws2_32
 endif
 
-glom_libglom_libglom_1_14_la_LDFLAGS = -no-undefined
+glom_libglom_libglom_ GLOM_ABI_VERSION@_la_LDFLAGS = -no-undefined
diff --git a/configure.ac b/configure.ac
index e830e4a..c044ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,7 @@ AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile
                  po/Makefile.in
                  glom.desktop.in
-                 glom/libglom/glom-1.14.pc
+                 glom/libglom/glom-${GLOM_ABI_VERSION}.pc:glom/libglom/glom.pc.in
                  docs/libglom_reference/Makefile
                  docs/libglom_reference/Doxyfile
                  docs/pyglom_reference/Makefile
diff --git a/glom/libglom/glom-1.14.pc.in b/glom/libglom/glom.pc.in
similarity index 92%
rename from glom/libglom/glom-1.14.pc.in
rename to glom/libglom/glom.pc.in
index 93b68dd..a0a66a0 100644
--- a/glom/libglom/glom-1.14.pc.in
+++ b/glom/libglom/glom.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: libglom
 Description: Library for accessing Glom documents and data structures.
 Requires: glibmm-2.4 giomm-2.4 libgdamm-4.0 libxml++-2.6
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lglom- GLOM_ABI_VERSION@
 Cflags: -I${includedir}/glom- GLOM_ABI_VERSION@