Switch over to GLib/GTK+ style library versioning. Update version numbers

Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in **/Makefile.am *.pc.in: Switch over to
        GLib/GTK+ style library versioning. Update version numbers
        to 1.0.0.

22 files changed, 165 insertions, 70 deletions

diff --git a/ChangeLog b/ChangeLog
index 5672e76a..3feb0e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 5672e76a..3feb0e95 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Tue Mar  5 11:00:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in **/Makefile.am *.pc.in: Switch over to 
+	GLib/GTK+ style library versioning. Update version numbers
+	to 1.0.0.
+
 2002-03-03  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): add sanitize-la.sh
diff --git a/configure.in b/configure.in
index e5b664ce..681e093b 100644
--- a/configure.in
+++ b/configure.in
@@ -2,13 +2,56 @@ dnl Process this file with autoconf to create configure.
 
 AC_INIT(ChangeLog)
 
-PANGO_MAJOR_VERSION=0
-PANGO_MINOR_VERSION=26
+dnl ==========================================================================
+dnl                               Versioning              
+dnl ==========================================================================
+
+dnl Making releases:
+dnl   PANGO_MICRO_VERSION += 1;
+dnl   PANGO_INTERFACE_AGE += 1;
+dnl   PANGO_BINARY_AGE += 1;
+dnl if any functions have been added, set PANGO_INTERFACE_AGE to 0.
+dnl if backwards compatibility has been broken,
+dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0.
+
+dnl The triplet 
+PANGO_MAJOR_VERSION=1
+PANGO_MINOR_VERSION=0
+PANGO_MICRO_VERSION=0
+PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION
+
+dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
+PANGO_API_VERSION=1.0
+
+dnl Number of releases since we've added interfaces
+PANGO_INTERFACE_AGE=0
+
+dnl Number of releases since we've broken binary compatibility. Should equal
+dnl PANGO_MICRO_VERSION for a stable release
+# PANGO_BINARY_AGE=0
+PANGO_BINARY_AGE=$PANGO_MICRO_VERSION
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
+AC_SUBST(PANGO_VERSION)
+AC_SUBST(PANGO_API_VERSION)
+AC_SUBST(PANGO_MICRO_VERSION)
+AC_SUBST(PANGO_INTERFACE_AGE)
+AC_SUBST(PANGO_BINARY_AGE)
 
-AM_INIT_AUTOMAKE(pango, $PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION)
+dnl libtool versioning
+lt_current=`expr $PANGO_MICRO_VERSION - $PANGO_INTERFACE_AGE`
+lt_revision=$PANGO_INTERFACE_AGE
+lt_age=`expr $PANGO_BINARY_AGE - $PANGO_INTERFACE_AGE`
+LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
+LT_CURRENT_MINUS_AGE=`expr $lt_current - $lt_age`
+
+AC_SUBST(LT_VERSION_INFO)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
+dnl ==========================================================================
+
+AM_INIT_AUTOMAKE(pango, $PANGO_VERSION)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -493,8 +536,6 @@ if $use_la_modules ; then
    AC_DEFINE(USE_LA_MODULES, 1, [Whether to load modules via .la files rather than directly])
 fi
 
-echo ================= $host ==================
-
 dnl ******************************************************
 dnl * See whether to include shared library dependencies *
 dnl ******************************************************
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a17442cc..8c2aea8e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -25,7 +25,12 @@ pango_viewer_SOURCES =		\
 	viewer-qt.h
 
 CLEANFILES = moc_viewer-qt.cc
-pango_viewer_LDADD = ../pango/libpangox.la ../pango/libpango.la $(FRIBIDI_LIBS) $(QT_LIBS) moc_viewer-qt.$(OBJEXT)
+pango_viewer_LDADD =					\
+	../pango/libpangox-$(PANGO_API_VERSION).la	\
+	../pango/libpango-$(PANGO_API_VERSION).la	\
+	$(FRIBIDI_LIBS)					\
+	$(QT_LIBS)					\
+	moc_viewer-qt.$(OBJEXT)
 ###################################################
 
 ###################################################
@@ -34,7 +39,10 @@ ft2_programs = pangoft2topgm
 endif
 
 pangoft2topgm_SOURCES = pangoft2topgm.c
-pangoft2topgm_LDADD = ../pango/libpango.la ../pango/libpangoft2.la $(FREETYPE_LIBS)
+pangoft2topgm_LDADD =					\
+	../pango/libpango-$(PANGO_API_VERSION).la	\
+	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
+	$(FREETYPE_LIBS)
 ###################################################
 
 bin_PROGRAMS = $(viewer_programs)
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 7786a0aa..a26cb44c 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to create Makefile.in.
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_ARABIC_XFT
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 5bbbab07..68e62970 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -2,11 +2,11 @@
 
 basic_sources = basic-x.c
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
-pangowin32libs = $(top_builddir)/pango/libpangowin32.la $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
+pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_BASIC_XFT
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 4163f4b6..12df843c 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -2,10 +2,10 @@
 
 sources = hangul-x.c
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_X
 if INCLUDE_HANGUL_X
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index aab8aace..ab7ffcaa 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -5,10 +5,10 @@ hebrew_x_sources = $(common_sources) hebrew-x.c
 hebrew_xft_sources = $(common_sources) hebrew-xft.c 
 hebrew_ft2_sources = $(common_sources) hebrew-ft2.c 
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_BASIC_XFT
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 51aeeb42..1961f881 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -8,10 +8,10 @@ sources =		 	\
 	devanagari-x.c		\
 	pango-indic-script.h
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_X
 
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index eb6c6a3a..3d5e6744 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to create Makefile.in.
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_TAMIL_XFT
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index f32ffb51..8d4c9f97 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -2,10 +2,10 @@
 
 sources = thai-x.c
 
-pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
-pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
+pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
+pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_X
 if INCLUDE_THAI_X
diff --git a/pango.pc.in b/pango.pc.in
index 70b1195c..00b14a11 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -7,6 +7,6 @@ Name: Pango
 Description: Internationalized text handling
 Version: @VERSION@
 Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
-Libs: -L${libdir} -lpango
+Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
 Cflags: -I${includedir}/pango-1.0
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 952b11c4..f225616a 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -32,7 +32,7 @@ INCLUDES = 					\
 
 if HAVE_X
 X_HFILES=pangox.h
-X_BUILD_LIBS=libpangox.la
+X_BUILD_LIBS=libpangox-1.0.la
 else
 X_HFILES=
 X_BUILD_LIBS=
@@ -40,7 +40,7 @@ endif
 
 if HAVE_WIN32
 WIN32_HFILES=pangowin32.h
-WIN32_BUILD_LIBS=libpangowin32.la
+WIN32_BUILD_LIBS=libpangowin32-1.0.la
 else
 WIN32_HFILES=
 WIN32_BUILD_LIBS=
@@ -48,7 +48,7 @@ endif
 
 if HAVE_XFT
 XFT_HFILES=pangoxft.h pango-ot.h
-XFT_BUILD_LIBS=libpangoxft.la
+XFT_BUILD_LIBS=libpangoxft-1.0.la
 else
 XFT_HFILES=
 XFT_BUILD_LIBS=
@@ -56,7 +56,7 @@ endif
 
 if HAVE_FREETYPE
 FT2_HFILES=pangoft2.h pango-ot.h
-FT2_BUILD_LIBS=libpangoft2.la
+FT2_BUILD_LIBS=libpangoft2-1.0.la
 else
 FT2_HFILES=
 FT2_BUILD_LIBS=
@@ -87,7 +87,7 @@ uninstall-libtool-import-lib:
 
 endif
 
-lib_LTLIBRARIES = libpango.la $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS)
+lib_LTLIBRARIES = libpango-1.0.la $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS)
 
 if MS_LIB_AVAILABLE
 noinst_DATA = pango.lib pangoft2.lib pangowin32.lib
@@ -113,9 +113,9 @@ bin_PROGRAMS = pango-querymodules
 pango_built_headers = pango-enum-types.h
 pango_built_cfiles = pango-enum-types.c
 
-$(OBJECTS) $(libpango_la_OBJECTS): $(pango_built_headers)
+$(OBJECTS) $(libpango_1_0_la_OBJECTS): $(pango_built_headers)
 
-libpango_la_SOURCES = 	   \
+libpango_1_0_la_SOURCES =  \
 	break.c 	   \
 	fonts.c 	   \
 	glyphstring.c 	   \
@@ -138,7 +138,7 @@ libpango_la_SOURCES = 	   \
 	shape.c	           \
 	$(pango_built_cfiles)
 
-libpangox_la_SOURCES = 	   \
+libpangox_1_0_la_SOURCES = \
 	modules.h 	   \
 	module-defs-x.c	   \
 	pangox.c	   \
@@ -147,21 +147,21 @@ libpangox_la_SOURCES = 	   \
 	pangox-fontmap.c   \
 	pango-indic.c
 
-# We use the -release flag for now until the API settles
-# down at which point we'll either use the GTK+ versioning
-# scheme or the standard libtool scheme.
-#
-libpango_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pango_export_symbols)
+libpango_1_0_la_LDFLAGS =			\
+	-version-info $(LT_VERSION_INFO)	\
+	$(GLIB_LIBS)				\
+	$(no_undefined) $(pango_export_symbols)
+
 if HAVE_FRIBIDI
 else
-libpango_la_LIBADD = mini-fribidi/libmini-fribidi.la
+libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la
 endif
 
-libpangox_la_LDFLAGS = -release $(VERSION)
-libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS)
-libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
+libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS)
+libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la
 
-libpangowin32_la_SOURCES =	\
+libpangowin32_1_0_la_SOURCES =	\
 	pangowin32.h		\
 	pangowin32.c		\
 	pangowin32-private.h	\
@@ -169,31 +169,35 @@ libpangowin32_la_SOURCES =	\
 	pangowin32-fontmap.c	\
 	module-defs-win32.c
 
-libpangowin32_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangowin32_export_symbols)
-libpangowin32_la_LIBADD = libpango.la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) 
-libpangowin32_la_DEPENDENCIES = libpango.la
+libpangowin32_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)	\
+	$(GLIB_LIBS)						\
+	$(no_undefined) $(pangowin32_export_symbols)
+libpangowin32_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_WIN32_MODULES) $(WIN32_LIBS) 
+libpangowin32_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la
 
 
-libpangoxft_la_SOURCES =   	\
+libpangoxft_1_0_la_SOURCES =   	\
 	pangoxft-font.c		\
 	pangoxft-fontmap.c      \
 	pangoxft-private.h	\
 	module-defs-xft.c
 
-libpangoxft_la_LIBADD = opentype/libpango-ot.la libpango.la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) 
-libpangoxft_la_LDFLAGS = -release $(VERSION)
-libpangoxft_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango.la
+libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) 
+libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la
 
-libpangoft2_la_SOURCES =   	\
+libpangoft2_1_0_la_SOURCES =   	\
 	pangoft2.h		\
 	pangoft2.c		\
 	pangoft2-private.h	\
 	pangoft2-fontmap.c	\
 	module-defs-ft2.c
 
-libpangoft2_la_LIBADD = mini-xft/libmini-xft.la opentype/libpango-ot.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) 
-libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
-libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la
+libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)	\
+	$(GLIB_LIBS)						\
+	$(no_undefined) $(pangowin32_export_symbols)
+libpangoft2_1_0_la_LIBADD = mini-xft/libmini-xft.la opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) 
+libpangoft2_1_0_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango-$(PANGO_API_VERSION).la
 
 pangoincludedir=$(includedir)/pango-1.0/pango
 
@@ -260,11 +264,11 @@ pango_querymodules_SOURCES = \
 	querymodules.c
 
 if HAVE_XFT
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
-pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la
+pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
+pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la
 else
 pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS)
-pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango.la
+pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la
 endif
 
 EXTRA_DIST =					\
@@ -302,20 +306,20 @@ CLEANFILES =					\
 	pango-enum-types.c			\
 	s-enum-types-c
 
-pango.lib: libpango.la pango.def
+pango.lib: libpango-$(PANGO_API_VERSION).la pango.def
 	lib -name:libpango-@PANGO_MAJOR_VERSION@-@PANGO_MINOR_VERSION@.dll -def:pango.def -out:$@
 
-pangoft2.lib: libpangoft2.la pangoft2.def
+pangoft2.lib: libpangoft2-$(PANGO_API_VERSION).la pangoft2.def
 	lib -name:libpangoft2-@PANGO_MAJOR_VERSION@-@PANGO_MINOR_VERSION@.dll -def:pangoft2.def -out:$@
 
-pangowin32.lib: libpangowin32.la pangowin32.def
+pangowin32.lib: libpangowin32-$(PANGO_API_VERSION).la pangowin32.def
 	lib -name:libpangowin32-@PANGO_MAJOR_VERSION@-@PANGO_MINOR_VERSION@.dll -def:pangowin32.def -out:$@
 
 install-data-local: install-ms-lib install-libtool-import-lib
 
 if DISABLE_EXPLICIT_DEPS
 install-exec-local: 
-	for i in libpangoft2.la libpangoxft.la libpangox.la ; do \
+	for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangox-$(PANGO_API_VERSION).la ; do \
 	  test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
 	done
 endif
diff --git a/pangoft2.pc.in b/pangoft2.pc.in
index 626d9432..3262d570 100644
--- a/pangoft2.pc.in
+++ b/pangoft2.pc.in
@@ -7,6 +7,6 @@ Name: Pango FT2
 Description: Freetype 2.0 font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangoft2 @PKGCONFIG_FREETYPE_LIBS@
+Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
 Cflags: -I${includedir}/pango-1.0 @FREETYPE_CFLAGS@
 
diff --git a/pangowin32.pc.in b/pangowin32.pc.in
index 5cb3d4b3..a880e05f 100644
--- a/pangowin32.pc.in
+++ b/pangowin32.pc.in
@@ -7,6 +7,6 @@ Name: Pango Win32
 Description: Win32 GDI font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangowin32 @WIN32_LIBS@
+Libs: -L${libdir} -lpangowin32-@PANGO_API_VERSION@ @WIN32_LIBS@
 Cflags: -I${includedir}/pango-1.0
 
diff --git a/pangox.pc.in b/pangox.pc.in
index 275c77e1..bb7ff511 100644
--- a/pangox.pc.in
+++ b/pangox.pc.in
@@ -7,6 +7,6 @@ Name: Pango X
 Description: X Window System font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangox @PKGCONFIG_X_LIBS@
+Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @PKGCONFIG_X_LIBS@
 Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@
 
diff --git a/pangoxft.pc.in b/pangoxft.pc.in
index 19cb0101..a4a4bae4 100644
--- a/pangoxft.pc.in
+++ b/pangoxft.pc.in
@@ -7,6 +7,6 @@ Name: Pango Xft
 Description: Xft font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangoxft @PKGCONFIG_XFT_LIBS@
+Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
 Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@ @FREETYPE_CFLAGS@