diff options
author | Brian Tarricone <bjt23@cornell.edu> | 2008-08-17 20:58:08 +0000 |
---|---|---|
committer | Brian Tarricone <bjt23@cornell.edu> | 2008-08-17 20:58:08 +0000 |
commit | 50276607ea2cc54cf518953d5f1bcf1afed11c63 (patch) | |
tree | 43b6417b6f14771fa8bc85925c5f7a21cc60ba01 | |
parent | 7d3e90099277e3f215fc6b1aa7045bd4ff822ae2 (diff) | |
download | garcon-50276607ea2cc54cf518953d5f1bcf1afed11c63.tar.gz |
2008-08-17 Brian Tarricone <bjt23@cornell.edu>
* configure.in.in: Set LIBXFCE4MENU_VERSION_API independently
of the package version.
* docs/reference/Makefile.am: use the correct API version when
linking with the library
git-svn-id: https://svn.xfce.org/svn/xfce/libxfce4menu/trunk@27489 a0aa69c2-05f4-0310-b83c-d5d913b14636
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in.in | 14 | ||||
-rw-r--r-- | docs/reference/Makefile.am | 2 |
3 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2008-08-17 Brian Tarricone <bjt23@cornell.edu> + + * configure.in.in: Set LIBXFCE4MENU_VERSION_API independently + of the package version. + * docs/reference/Makefile.am: use the correct API version when + linking with the library + 2008-07-15 Jannis Pohlmann <jannis@xfce.org> * autogen.sh: Change @REVISION@ substitution for git svn diff --git a/configure.in.in b/configure.in.in index 16e1b37..059ee84 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,9 +10,11 @@ dnl *************************** dnl *** Version information *** dnl *************************** m4_define([libxfce4menu_verinfo], [0:0:0]) -m4_define([libxfce4menu_version_major], [0]) -m4_define([libxfce4menu_version_minor], [1]) -m4_define([libxfce4menu_version_micro], [0]) +m4_define([libxfce4menu_version_api_major], [0]) +m4_define([libxfce4menu_version_api_minor], [1]) +m4_define([libxfce4menu_version_major], [4]) +m4_define([libxfce4menu_version_minor], [5]) +m4_define([libxfce4menu_version_micro], [80]) m4_define([libxfce4menu_version_nano], []) m4_define([libxfce4menu_version_build], [r@REVISION@]) m4_define([libxfce4menu_version_tag], [svn]) @@ -54,10 +56,14 @@ dnl **************************** LIBXFCE4MENU_VERSION_MAJOR=libxfce4menu_version_major() LIBXFCE4MENU_VERSION_MINOR=libxfce4menu_version_minor() LIBXFCE4MENU_VERSION_MICRO=libxfce4menu_version_micro() -LIBXFCE4MENU_VERSION_API=$LIBXFCE4MENU_VERSION_MAJOR.$LIBXFCE4MENU_VERSION_MINOR +LIBXFCE4MENU_VERSION_API_MAJOR=libxfce4menu_version_api_major() +LIBXFCE4MENU_VERSION_API_MINOR=libxfce4menu_version_api_minor() +LIBXFCE4MENU_VERSION_API=$LIBXFCE4MENU_VERSION_API_MAJOR.$LIBXFCE4MENU_VERSION_API_MINOR AC_SUBST([LIBXFCE4MENU_VERSION_MAJOR]) AC_SUBST([LIBXFCE4MENU_VERSION_MINOR]) AC_SUBST([LIBXFCE4MENU_VERSION_MICRO]) +AC_SUBST([LIBXFCE4MENU_VERSION_API_MAJOR]) +AC_SUBST([LIBXFCE4MENU_VERSION_API_MINOR]) AC_SUBST([LIBXFCE4MENU_VERSION_API]) dnl ******************************* diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index a286967..2ebe79f 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -51,7 +51,7 @@ GTKDOC_LIBS = \ $(GTHREAD_LIBS) \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_LIBS) \ - $(top_builddir)/libxfce4menu/libxfce4menu-$(LIBXFCE4MENU_VERSION_MAJOR).$(LIBXFCE4MENU_VERSION_MINOR).la + $(top_builddir)/libxfce4menu/libxfce4menu-$(LIBXFCE4MENU_VERSION_API).la include $(top_srcdir)/gtk-doc.make |