[gnome-menus] build: Version the library name and the pkg-config file
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-menus] build: Version the library name and the pkg-config file
- Date: Mon, 1 Aug 2011 17:43:22 +0000 (UTC)
commit 91a698f7860b3d8d5f29ffcdfcdbadf0cc347bad
Author: Vincent Untz <vuntz gnome org>
Date: Wed Jun 8 17:39:42 2011 +0200
build: Version the library name and the pkg-config file
The library is now libgnome-menu-3, the pkg-config file is
libgnome-menu-3.0, the header directory is gnome-menus-3.0 and the
gettext package is gnome-menus-3.0.
This way, it's possible to keep the old libgnome-menu around if some
applications still need it.
configure.ac | 8 ++--
libmenu/Makefile.am | 40 ++++++++++----------
...d.pc.in => libgnome-menu-3.0-uninstalled.pc.in} | 2 +-
...libgnome-menu.pc.in => libgnome-menu-3.0.pc.in} | 4 +-
util/Makefile.am | 2 +-
5 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0cbc532..ae47a37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,10 +20,10 @@ GNOME_MAINTAINER_MODE_DEFINES
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
-LIB_MENU_LT_VERSION=7:0:0
+LIB_MENU_LT_VERSION=0:0:0
AC_SUBST(LIB_MENU_LT_VERSION)
-GETTEXT_PACKAGE=gnome-menus
+GETTEXT_PACKAGE=gnome-menus-3.0
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain])
AC_SUBST(GETTEXT_PACKAGE)
@@ -99,8 +99,8 @@ GOBJECT_INTROSPECTION_CHECK([0.9.5])
AC_OUTPUT([
Makefile
libmenu/Makefile
-libmenu/libgnome-menu.pc
-libmenu/libgnome-menu-uninstalled.pc
+libmenu/libgnome-menu-3.0.pc
+libmenu/libgnome-menu-3.0-uninstalled.pc
layout/Makefile
desktop-directories/Makefile
util/Makefile
diff --git a/libmenu/Makefile.am b/libmenu/Makefile.am
index 9e7b8c4..071cc77 100644
--- a/libmenu/Makefile.am
+++ b/libmenu/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgnome-menu.la
+lib_LTLIBRARIES = libgnome-menu-3.la
AM_CPPFLAGS = \
$(GIO_UNIX_CFLAGS) \
@@ -8,11 +8,11 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(WARN_CFLAGS)
-libgnome_menu_includedir = $(includedir)/gnome-menus
-libgnome_menu_include_HEADERS = \
+libgnome_menu_3_includedir = $(includedir)/gnome-menus-3.0
+libgnome_menu_3_include_HEADERS = \
gmenu-tree.h
-libgnome_menu_sources = \
+libgnome_menu_3_sources = \
canonicalize.c \
desktop-entries.c \
entry-directories.c \
@@ -21,8 +21,8 @@ libgnome_menu_sources = \
menu-monitor.c \
menu-util.c
-libgnome_menu_la_SOURCES = \
- $(libgnome_menu_sources) \
+libgnome_menu_3_la_SOURCES = \
+ $(libgnome_menu_3_sources) \
canonicalize.h \
desktop-entries.h \
entry-directories.h \
@@ -31,20 +31,20 @@ libgnome_menu_la_SOURCES = \
menu-monitor.h \
menu-util.h
-libgnome_menu_la_LIBADD = \
+libgnome_menu_3_la_LIBADD = \
$(GIO_UNIX_LIBS)
-libgnome_menu_la_LDFLAGS = \
+libgnome_menu_3_la_LDFLAGS = \
-version-info $(LIB_MENU_LT_VERSION) \
-no-undefined \
-export-symbols-regex gmenu_tree
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgnome-menu.pc
+pkgconfig_DATA = libgnome-menu-3.0.pc
EXTRA_DIST = \
- libgnome-menu.pc.in \
- libgnome-menu-uninstalled.pc.in
+ libgnome-menu-3.0.pc.in \
+ libgnome-menu-3.0-uninstalled.pc.in
CLEANFILES =
@@ -55,15 +55,15 @@ INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
-introspection_sources = $(libgnome_menu_include_HEADERS) gmenu-tree.c
-
-GMenu-4.0.gir: libgnome-menu.la
-GMenu_4_0_gir_INCLUDES = Gio-2.0
-GMenu_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
-GMenu_4_0_gir_LIBS = libgnome-menu.la
-GMenu_4_0_gir_SCANNERFLAGS = --identifier-prefix=GMenu --symbol-prefix=gmenu --pkg-export=libgnome-menu
-GMenu_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-INTROSPECTION_GIRS += GMenu-4.0.gir
+introspection_sources = $(libgnome_menu_3_include_HEADERS) gmenu-tree.c
+
+GMenu-3.0.gir: libgnome-menu-3.la
+GMenu_3_0_gir_INCLUDES = Gio-2.0
+GMenu_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
+GMenu_3_0_gir_LIBS = libgnome-menu-3.la
+GMenu_3_0_gir_SCANNERFLAGS = --identifier-prefix=GMenu --symbol-prefix=gmenu --pkg-export=libgnome-menu-3.0
+GMenu_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+INTROSPECTION_GIRS += GMenu-3.0.gir
girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libmenu/libgnome-menu-uninstalled.pc.in b/libmenu/libgnome-menu-3.0-uninstalled.pc.in
similarity index 80%
rename from libmenu/libgnome-menu-uninstalled.pc.in
rename to libmenu/libgnome-menu-3.0-uninstalled.pc.in
index c2ff94b..42a6ad9 100644
--- a/libmenu/libgnome-menu-uninstalled.pc.in
+++ b/libmenu/libgnome-menu-3.0-uninstalled.pc.in
@@ -7,5 +7,5 @@ Name: libgnome-menu
Description: Desktop Menu Specification Implementation
Requires: glib-2.0
Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-menu.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libgnome-menu-3.la
Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libmenu/libgnome-menu.pc.in b/libmenu/libgnome-menu-3.0.pc.in
similarity index 72%
rename from libmenu/libgnome-menu.pc.in
rename to libmenu/libgnome-menu-3.0.pc.in
index 1746c81..5f81310 100644
--- a/libmenu/libgnome-menu.pc.in
+++ b/libmenu/libgnome-menu-3.0.pc.in
@@ -7,5 +7,5 @@ Name: libgnome-menu
Description: Desktop Menu Specification Implementation
Requires: glib-2.0
Version: @VERSION@
-Libs: -L${libdir} -lgnome-menu
-Cflags: -I${includedir}/gnome-menus
+Libs: -L${libdir} -lgnome-menu-3
+Cflags: -I${includedir}/gnome-menus-3.0
diff --git a/util/Makefile.am b/util/Makefile.am
index 35df573..cb36691 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,7 +15,7 @@ gnome_menu_spec_test_SOURCES = \
gnome_menu_spec_test_LDADD = \
$(GIO_UNIX_LIBS) \
- ../libmenu/libgnome-menu.la
+ ../libmenu/libgnome-menu-3.la
EXTRA_DIST = gnome-menus-ls.js
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]