[pangomm] Substitute API version in filenames dynamically
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pangomm] Substitute API version in filenames dynamically
- Date: Thu, 20 Aug 2009 10:51:18 +0000 (UTC)
commit 0529889a82b1c97c2983a77712c5f0bb72a48516
Author: Daniel Elstner <danielk openismus com>
Date: Thu Aug 20 12:48:02 2009 +0200
Substitute API version in filenames dynamically
* pango/pangomm.pc.in: Rename file from pango/pangomm-1.4.pc.in.
* pango/pangomm-uninstalled.pc.in: Rename file from
pango/pangomm-1.4-uninstalled.pc.in.
* configure.ac (AC_CONFIG_FILES): Insert ${PANGOMM_MODULE_NAME}
into output filenames and remove the hard-coded version from the
input filenames.
* pango/pangomm/Makefile.am (lib_LTLIBRARIES): Substitute
@PANGOMM_API_VERSION@ into the libtool archive name as well as
the variable names derived from it instead of hard-coding the
API version.
ChangeLog | 15 +++++++++++++++
configure.ac | 4 ++--
...uninstalled.pc.in => pangomm-uninstalled.pc.in} | 0
pango/{pangomm-1.4.pc.in => pangomm.pc.in} | 0
pango/pangomm/Makefile.am | 8 ++++----
5 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a57bda7..76976c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2009-08-20 Daniel Elstner <danielk openismus com>
+ Substitute API version in filenames dynamically
+
+ * pango/pangomm.pc.in: Rename file from pango/pangomm-1.4.pc.in.
+ * pango/pangomm-uninstalled.pc.in: Rename file from
+ pango/pangomm-1.4-uninstalled.pc.in.
+ * configure.ac (AC_CONFIG_FILES): Insert ${PANGOMM_MODULE_NAME}
+ into output filenames and remove the hard-coded version from the
+ input filenames.
+ * pango/pangomm/Makefile.am (lib_LTLIBRARIES): Substitute
+ @PANGOMM_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]/pangomm/pangomm.rc.in: Use newer @PACKAGE_VERSION@
diff --git a/configure.ac b/configure.ac
index 4a31c6a..17e51a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,8 +60,8 @@ MM_ARG_ENABLE_WARNINGS([PANGOMM_WXXFLAGS],
AC_CONFIG_FILES([Makefile
tools/Makefile
- pango/pangomm-1.4.pc
- pango/pangomm-1.4-uninstalled.pc
+ pango/${PANGOMM_MODULE_NAME}.pc:pango/pangomm.pc.in
+ pango/${PANGOMM_MODULE_NAME}-uninstalled.pc:pango/pangomm-uninstalled.pc.in
pango/src/Makefile
pango/pangomm/Makefile
docs/Makefile
diff --git a/pango/pangomm-1.4-uninstalled.pc.in b/pango/pangomm-uninstalled.pc.in
similarity index 100%
rename from pango/pangomm-1.4-uninstalled.pc.in
rename to pango/pangomm-uninstalled.pc.in
diff --git a/pango/pangomm-1.4.pc.in b/pango/pangomm.pc.in
similarity index 100%
rename from pango/pangomm-1.4.pc.in
rename to pango/pangomm.pc.in
diff --git a/pango/pangomm/Makefile.am b/pango/pangomm/Makefile.am
index 7093514..08de02b 100644
--- a/pango/pangomm/Makefile.am
+++ b/pango/pangomm/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 = libpangomm-1.4.la
+lib_LTLIBRARIES = libpangomm- PANGOMM_API_VERSION@.la
include $(srcdir)/../src/filelist.am
include $(srcdir)/filelist.am
@@ -26,6 +26,6 @@ local_cppflags = $(binding_includes) $(binding_cppflags) -DPANGOMM_BUILD=1
AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(PANGOMM_CFLAGS)
AM_CXXFLAGS = $(PANGOMM_WXXFLAGS)
-libpangomm_1_4_la_SOURCES = $(binding_sources)
-libpangomm_1_4_la_LDFLAGS = -no-undefined -version-info $(LIBPANGOMM_SO_VERSION)
-libpangomm_1_4_la_LIBADD = $(PANGOMM_LIBS)
+libpangomm_ PANGOMM_API_VERSION@_la_SOURCES = $(binding_sources)
+libpangomm_ PANGOMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBPANGOMM_SO_VERSION)
+libpangomm_ PANGOMM_API_VERSION@_la_LIBADD = $(PANGOMM_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]