Substitute API version in filenames dynamically

* glib/glibmm.pc.in: Rename file from glib/glibmm-2.4.pc.in.
* glib/glibmm-uninstalled.pc.in: Rename file from
glib/glibmm-2.4-uninstalled.pc.in.
* gio/giomm.pc.in: Rename file from gio/giomm-2.4.pc.in.
* gio/giomm-uninstalled.pc.in: Rename file from
gio/giomm-2.4-uninstalled.pc.in.
* configure.ac (AC_CONFIG_FILES): Insert ${GLIBMM_MODULE_NAME}
and ${GIOMM_MODULE_NAME} into output filenames and remove the
hard-coded version from the input filenames.
* glib/glibmm/Makefile.am (lib_LTLIBRARIES): Substitute
@GLIBMM_API_VERSION@ into the libtool archive name as well as
the variable names derived from it instead of hard-coding the
API version.

8 files changed, 30 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 7af171a1..b359fbc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2009-08-20  Daniel Elstner  <danielk@openismus.com>
 
+	Substitute API version in filenames dynamically
+
+	* glib/glibmm.pc.in: Rename file from glib/glibmm-2.4.pc.in.
+	* glib/glibmm-uninstalled.pc.in: Rename file from
+	glib/glibmm-2.4-uninstalled.pc.in.
+	* gio/giomm.pc.in: Rename file from gio/giomm-2.4.pc.in.
+	* gio/giomm-uninstalled.pc.in: Rename file from
+	gio/giomm-2.4-uninstalled.pc.in.
+	* configure.ac (AC_CONFIG_FILES): Insert ${GLIBMM_MODULE_NAME}
+	and ${GIOMM_MODULE_NAME} into output filenames and remove the
+	hard-coded version from the input filenames.
+	* glib/glibmm/Makefile.am (lib_LTLIBRARIES): Substitute
+	@GLIBMM_API_VERSION@ into the libtool archive name as well as
+	the variable names derived from it instead of hard-coding the
+	API version.
+
+2009-08-20  Daniel Elstner  <danielk@openismus.com>
+
 	Do not hard-code API version in resource files
 
 	* MSVC_Net200[58]/glibmm/glibmm.rc.in: Use newer @PACKAGE_VERSION@
diff --git a/configure.ac b/configure.ac
index d85c65c0..897b27d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,12 +126,12 @@ AC_CONFIG_FILES([Makefile
                  tools/Makefile
                  tools/gmmproc
                  tools/generate_wrap_init.pl
-                 glib/glibmm-2.4.pc
-                 glib/glibmm-2.4-uninstalled.pc
+                 glib/${GLIBMM_MODULE_NAME}.pc:glib/glibmm.pc.in
+                 glib/${GLIBMM_MODULE_NAME}-uninstalled.pc:glib/glibmm-uninstalled.pc.in
                  glib/src/Makefile
                  glib/glibmm/Makefile
-                 gio/giomm-2.4.pc
-                 gio/giomm-2.4-uninstalled.pc
+                 gio/${GIOMM_MODULE_NAME}.pc:gio/giomm.pc.in
+                 gio/${GIOMM_MODULE_NAME}-uninstalled.pc:gio/giomm-uninstalled.pc.in
                  gio/src/Makefile
                  gio/giomm/Makefile
                  tests/Makefile
diff --git a/gio/giomm-2.4-uninstalled.pc.in b/gio/giomm-uninstalled.pc.in
index 5e7ce338..5e7ce338 100644
--- a/gio/giomm-2.4-uninstalled.pc.in
+++ b/gio/giomm-uninstalled.pc.in
diff --git a/gio/giomm-2.4.pc.in b/gio/giomm.pc.in
index 5efeab52..5efeab52 100644
--- a/gio/giomm-2.4.pc.in
+++ b/gio/giomm.pc.in
diff --git a/gio/giomm/Makefile.am b/gio/giomm/Makefile.am
index 0c0b4752..f88b28c3 100644
--- a/gio/giomm/Makefile.am
+++ b/gio/giomm/Makefile.am
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-lib_LTLIBRARIES = libgiomm-2.4.la
+lib_LTLIBRARIES = libgiomm-@GIOMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -39,6 +39,6 @@ AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
 
 local_libadd = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
 
-libgiomm_2_4_la_SOURCES = $(binding_sources)
-libgiomm_2_4_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
-libgiomm_2_4_la_LIBADD  = $(GIOMM_LIBS) $(local_libadd)
+libgiomm_@GIOMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libgiomm_@GIOMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
+libgiomm_@GIOMM_API_VERSION@_la_LIBADD  = $(GIOMM_LIBS) $(local_libadd)
diff --git a/glib/glibmm-2.4-uninstalled.pc.in b/glib/glibmm-uninstalled.pc.in
index 2d61c292..2d61c292 100644
--- a/glib/glibmm-2.4-uninstalled.pc.in
+++ b/glib/glibmm-uninstalled.pc.in
diff --git a/glib/glibmm-2.4.pc.in b/glib/glibmm.pc.in
index b9a4e49c..b9a4e49c 100644
--- a/glib/glibmm-2.4.pc.in
+++ b/glib/glibmm.pc.in
diff --git a/glib/glibmm/Makefile.am b/glib/glibmm/Makefile.am
index 312bf4c6..b721d203 100644
--- a/glib/glibmm/Makefile.am
+++ b/glib/glibmm/Makefile.am
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-lib_LTLIBRARIES = libglibmm-2.4.la
+lib_LTLIBRARIES = libglibmm-@GLIBMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -34,6 +34,6 @@ local_cppflags = $(binding_includes) $(binding_cppflags) -DGLIBMM_BUILD=1
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GLIBMM_CFLAGS)
 AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
 
-libglibmm_2_4_la_SOURCES = $(binding_sources)
-libglibmm_2_4_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
-libglibmm_2_4_la_LIBADD  = $(GLIBMM_LIBS)
+libglibmm_@GLIBMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libglibmm_@GLIBMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
+libglibmm_@GLIBMM_API_VERSION@_la_LIBADD  = $(GLIBMM_LIBS)