[uim-commit] r2468 - branches/1.0/uim

yamaken at freedesktop.org yamaken at freedesktop.org
Thu Dec 8 18:24:16 PST 2005


Author: yamaken
Date: 2005-12-08 18:23:53 -0800 (Thu, 08 Dec 2005)
New Revision: 2468

Added:
   branches/1.0/uim/libtool-version.mk
Modified:
   branches/1.0/uim/Makefile.am
Log:
* uim/libtool-version.mk
* uim/Makefile.am
  - Port r2467 from trunk


Modified: branches/1.0/uim/Makefile.am
===================================================================
--- branches/1.0/uim/Makefile.am	2005-12-09 02:22:41 UTC (rev 2467)
+++ branches/1.0/uim/Makefile.am	2005-12-09 02:23:53 UTC (rev 2468)
@@ -1,6 +1,8 @@
+include libtool-version.mk
+
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = config.h.in iso-639-1.def slib.c uim-compat-scm.c
+EXTRA_DIST = iso-639-1.def slib.c uim-compat-scm.c
 
 uim_defs = -DSCM_FILES=\"$(datadir)/uim\"
 
@@ -90,7 +92,7 @@
 
 libuimincludedir =  $(includedir)/uim
 
-libuim_la_LDFLAGS = -version-info 1:0:1 -export-symbols-regex uim.\*
+libuim_la_LDFLAGS = -version-info $(libuim_version) -export-symbols-regex uim.\*
 libuim_la_LIBADD = @LTLIBINTL@ @LTLIBICONV@ $(top_builddir)/replace/libreplace.la
 libuim_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DPKGLIBDIR=\"$(pkglibdir)\" \
 		     -DPKGDATADIR=\"$(pkgdatadir)\"
@@ -99,7 +101,7 @@
 libuim_la_CPPFLAGS += -DDEBUG -DDEBUG_SCM=1
 endif
 
-libuim_custom_la_LDFLAGS = -version-info 1:0:1 -export-symbols-regex uim.\*
+libuim_custom_la_LDFLAGS = -version-info $(libuim_custom_version) -export-symbols-regex uim.\*
 libuim_custom_la_LIBADD = 
 libuim_custom_la_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
 

Copied: branches/1.0/uim/libtool-version.mk (from rev 2467, trunk/uim/libtool-version.mk)



More information about the uim-commit mailing list