diff options
| author | Christian Persch <chpe@src.gnome.org> | 2007-12-20 14:31:01 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-12-20 14:31:01 +0000 |
| commit | ce340d1b33ba230fa27f7303d541729d44b6c5ef (patch) | |
| tree | f2e6e636ee5c229e038fbb5bcb5777932ae6de41 | |
| parent | b98f1b151c638528f059ac65ba348c4565ab2a11 (diff) | |
| download | gtk+-ce340d1b33ba230fa27f7303d541729d44b6c5ef.tar.gz | |
Keep the same libtool version as the standalone libgail-util had. Bug #504643.
svn path=/trunk/; revision=19210
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | modules/other/gail/libgail-util/Makefile.am | 4 |
3 files changed, 18 insertions, 4 deletions
@@ -1,10 +1,17 @@ +2007-12-20 Christian Persch <chpe@gnome.org> + + * configure.in: + * modules/other/gail/libgail-util/Makefile.am: + Keep the same libtool version as the standalone libgail-util had. + Bug #504643. + 2007-12-20 15:30:09 Tim Janik <timj@imendio.com> * Makefile.decl: generate HTML reports for test-report perf-report full-report. 2007-12-20 Alexander Larsson <alexl@redhat.com> - - * gdk/x11/gdkapplaunchcontext-x11.c: + + * gdk/x11/gdkapplaunchcontext-x11.c: Update for gio API changes 2007-12-20 Richard Hult <richard@imendio.com> diff --git a/configure.in b/configure.in index 58ea15787e..47e354fe49 100644 --- a/configure.in +++ b/configure.in @@ -93,6 +93,13 @@ LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_CURRENT_MINUS_AGE) +m4_define([gail_lt_current],[18]) +m4_define([gail_lt_revision],[1]) +m4_define([gail_lt_age],[0]) +m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age]) +m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)]) +AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info]) +AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age]) # # gdk-pixbuf gets versioned separately, and for now, using standard diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am index 428ac9e3a0..7141713d69 100644 --- a/modules/other/gail/libgail-util/Makefile.am +++ b/modules/other/gail/libgail-util/Makefile.am @@ -62,13 +62,13 @@ libgailutil_la_LIBADD = \ $(GTK_DEP_LIBS) libgailutil_la_LDFLAGS = \ - -version-info $(LT_VERSION_INFO) \ + -version-info $(GAIL_LT_VERSION_INFO) \ $(no_undefined) \ $(export_symbols) \ $(LDFLAGS) gailutil.lib: libgailutil.la gailutil.def - lib -name:libgailutil-@LT_CURRENT_MINUS_AGE@.dll -def:gailutil.def -out:$@ + lib -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@ install-data-local: install-ms-lib install-libtool-import-lib |