GNOME.org
 

[gtkmm] Substitute API version in filenames dynamically

commit 31036cf8f61141b7f61ddd3b97102f74279416d5
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 13:06:21 2009 +0200

    Substitute API version in filenames dynamically
    
    * atk/atkmm.pc.in: Rename file from atk/atkmm-1.6.pc.in.
    * atk/atkmm-uninstalled.pc.in: Rename file from
    atk/atkmm-1.6-uninstalled.pc.in.
    * gdk/gdkmm.pc.in: Rename file from gdk/gdkmm-2.4.pc.in.
    * gdk/gdkmm-uninstalled.pc.in: Rename file from
    gdk/gdkmm-2.4-uninstalled.pc.in.
    * gtk/gtkmm.pc.in: Rename file from gtk/gtkmm-2.4.pc.in.
    * gtk/gtkmm-uninstalled.pc.in: Rename file from
    gtk/gtkmm-2.4-uninstalled.pc.in.
    * configure.ac (AC_CONFIG_FILES): Insert ${ATKMM_MODULE_NAME},
    ${GDKMM_MODULE_NAME} and ${GTKMM_MODULE_NAME} into output filenames
    and remove the hard-coded version from the input filenames.
    * {atk,gdk,gtk}/{atk,gdk,gtk}mm/Makefile.am (lib_LTLIBRARIES):
    Substitute @{ATK,GDK,GTK}MM_API_VERSION@ into the libtool archive
    names as well as the variable names derived from them instead of
    hard-coding the API versions.

 ChangeLog                                          |   21 ++++++++++++++++++++
 ...6-uninstalled.pc.in => atkmm-uninstalled.pc.in} |    0
 atk/{atkmm-1.6.pc.in => atkmm.pc.in}               |    0
 atk/atkmm/Makefile.am                              |    8 +++---
 configure.ac                                       |   12 +++++-----
 ...4-uninstalled.pc.in => gdkmm-uninstalled.pc.in} |    0
 gdk/{gdkmm-2.4.pc.in => gdkmm.pc.in}               |    0
 gdk/gdkmm/Makefile.am                              |    8 +++---
 ...4-uninstalled.pc.in => gtkmm-uninstalled.pc.in} |    0
 gtk/{gtkmm-2.4.pc.in => gtkmm.pc.in}               |    0
 gtk/gtkmm/Makefile.am                              |    8 +++---
 11 files changed, 39 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4b777cc..e3b5a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
+	Substitute API version in filenames dynamically
+
+	* atk/atkmm.pc.in: Rename file from atk/atkmm-1.6.pc.in.
+	* atk/atkmm-uninstalled.pc.in: Rename file from
+	atk/atkmm-1.6-uninstalled.pc.in.
+	* gdk/gdkmm.pc.in: Rename file from gdk/gdkmm-2.4.pc.in.
+	* gdk/gdkmm-uninstalled.pc.in: Rename file from
+	gdk/gdkmm-2.4-uninstalled.pc.in.
+	* gtk/gtkmm.pc.in: Rename file from gtk/gtkmm-2.4.pc.in.
+	* gtk/gtkmm-uninstalled.pc.in: Rename file from
+	gtk/gtkmm-2.4-uninstalled.pc.in.
+	* configure.ac (AC_CONFIG_FILES): Insert ${ATKMM_MODULE_NAME},
+	${GDKMM_MODULE_NAME} and ${GTKMM_MODULE_NAME} into output filenames
+	and remove the hard-coded version from the input filenames.
+	* {atk,gdk,gtk}/{atk,gdk,gtk}mm/Makefile.am (lib_LTLIBRARIES):
+	Substitute @{ATK,GDK,GTK}MM_API_VERSION@ into the libtool archive
+	names as well as the variable names derived from them instead of
+	hard-coding the API versions.
+
 2009-08-19  Daniel Elstner  <danielk openismus com>
 
 	Predefine ATKMM_API and GDKMM_API for Doxygen
diff --git a/atk/atkmm-1.6-uninstalled.pc.in b/atk/atkmm-uninstalled.pc.in
similarity index 100%
rename from atk/atkmm-1.6-uninstalled.pc.in
rename to atk/atkmm-uninstalled.pc.in
diff --git a/atk/atkmm-1.6.pc.in b/atk/atkmm.pc.in
similarity index 100%
rename from atk/atkmm-1.6.pc.in
rename to atk/atkmm.pc.in
diff --git a/atk/atkmm/Makefile.am b/atk/atkmm/Makefile.am
index b701b84..ba632a8 100644
--- a/atk/atkmm/Makefile.am
+++ b/atk/atkmm/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 = libatkmm-1.6.la
+lib_LTLIBRARIES = libatkmm- ATKMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -34,6 +34,6 @@ local_cppflags = $(binding_includes) $(binding_cppflags) -DATKMM_BUILD=1
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(ATKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
 
-libatkmm_1_6_la_SOURCES = $(binding_sources)
-libatkmm_1_6_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
-libatkmm_1_6_la_LIBADD  = $(ATKMM_LIBS)
+libatkmm_ ATKMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libatkmm_ ATKMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
+libatkmm_ ATKMM_API_VERSION@_la_LIBADD  = $(ATKMM_LIBS)
diff --git a/configure.ac b/configure.ac
index 89e2d68..bcd9fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,16 +101,16 @@ MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
 
 AC_CONFIG_FILES([Makefile
                  tools/Makefile
-                 atk/atkmm-1.6.pc
-                 atk/atkmm-1.6-uninstalled.pc
+                 atk/${ATKMM_MODULE_NAME}.pc:atk/atkmm.pc.in
+                 atk/${ATKMM_MODULE_NAME}-uninstalled.pc:atk/atkmm-uninstalled.pc.in
                  atk/src/Makefile
                  atk/atkmm/Makefile
-                 gdk/gdkmm-2.4.pc
-                 gdk/gdkmm-2.4-uninstalled.pc
+                 gdk/${GDKMM_MODULE_NAME}.pc:gdk/gdkmm.pc.in
+                 gdk/${GDKMM_MODULE_NAME}-uninstalled.pc:gdk/gdkmm-uninstalled.pc.in
                  gdk/src/Makefile
                  gdk/gdkmm/Makefile
-                 gtk/gtkmm-2.4.pc
-                 gtk/gtkmm-2.4-uninstalled.pc
+                 gtk/${GTKMM_MODULE_NAME}.pc:gtk/gtkmm.pc.in
+                 gtk/${GTKMM_MODULE_NAME}-uninstalled.pc:gtk/gtkmm-uninstalled.pc.in
                  gtk/src/Makefile
                  gtk/gtkmm/Makefile
                  tests/Makefile
diff --git a/gdk/gdkmm-2.4-uninstalled.pc.in b/gdk/gdkmm-uninstalled.pc.in
similarity index 100%
rename from gdk/gdkmm-2.4-uninstalled.pc.in
rename to gdk/gdkmm-uninstalled.pc.in
diff --git a/gdk/gdkmm-2.4.pc.in b/gdk/gdkmm.pc.in
similarity index 100%
rename from gdk/gdkmm-2.4.pc.in
rename to gdk/gdkmm.pc.in
diff --git a/gdk/gdkmm/Makefile.am b/gdk/gdkmm/Makefile.am
index d439b2e..e669cd8 100644
--- a/gdk/gdkmm/Makefile.am
+++ b/gdk/gdkmm/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 = libgdkmm-2.4.la
+lib_LTLIBRARIES = libgdkmm- GDKMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -34,6 +34,6 @@ local_cppflags = $(binding_includes) $(binding_cppflags) -DGDKMM_BUILD=1
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GDKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
 
-libgdkmm_2_4_la_SOURCES = $(binding_sources)
-libgdkmm_2_4_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
-libgdkmm_2_4_la_LIBADD  = $(GDKMM_LIBS)
+libgdkmm_ GDKMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libgdkmm_ GDKMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
+libgdkmm_ GDKMM_API_VERSION@_la_LIBADD  = $(GDKMM_LIBS)
diff --git a/gtk/gtkmm-2.4-uninstalled.pc.in b/gtk/gtkmm-uninstalled.pc.in
similarity index 100%
rename from gtk/gtkmm-2.4-uninstalled.pc.in
rename to gtk/gtkmm-uninstalled.pc.in
diff --git a/gtk/gtkmm-2.4.pc.in b/gtk/gtkmm.pc.in
similarity index 100%
rename from gtk/gtkmm-2.4.pc.in
rename to gtk/gtkmm.pc.in
diff --git a/gtk/gtkmm/Makefile.am b/gtk/gtkmm/Makefile.am
index 7cb31d2..f763bc2 100644
--- a/gtk/gtkmm/Makefile.am
+++ b/gtk/gtkmm/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 = libgtkmm-2.4.la
+lib_LTLIBRARIES = libgtkmm- GTKMM_API_VERSION@.la
 
 include $(srcdir)/../src/filelist.am
 include $(srcdir)/filelist.am
@@ -44,6 +44,6 @@ local_cppflags = $(binding_includes) $(local_includes) $(binding_cppflags) -DGTK
 AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
 
-libgtkmm_2_4_la_SOURCES = $(binding_sources)
-libgtkmm_2_4_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
-libgtkmm_2_4_la_LIBADD  = $(local_libadd) $(GTKMM_LIBS)
+libgtkmm_ GTKMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libgtkmm_ GTKMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGTKMM_SO_VERSION)
+libgtkmm_ GTKMM_API_VERSION@_la_LIBADD  = $(local_libadd) $(GTKMM_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]