mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: use new versioning scheme

Browse Source 
Use the documented libweston-$major.so.0.$minor.$patch scheme.

An (almost) identical one is used by GLIB, GDK{2,3}, QT5, json-glib and
others.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Emil Velikov
2016-07-22 14:51:51 +01:00
committed by Pekka Paalanen
parent aa485921cf
commit 7fe47f314b
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+12 -12
View File
@@ -5,7 +5,7 @@ noinst_PROGRAMS =
libexec_PROGRAMS = libexec_PROGRAMS =
moduledir = $(libdir)/weston moduledir = $(libdir)/weston
module_LTLIBRARIES = module_LTLIBRARIES =
libweston_moduledir = $(libdir)/libweston-${LIBWESTON_ABI_VERSION} libweston_moduledir = $(libdir)/libweston-$(LIBWESTON_MAJOR)
libweston_module_LTLIBRARIES = libweston_module_LTLIBRARIES =
noinst_LTLIBRARIES = noinst_LTLIBRARIES =
BUILT_SOURCES = BUILT_SOURCES =
@@ -61,15 +61,15 @@ CLEANFILES = weston.ini \
internal-screenshot-00.png \ internal-screenshot-00.png \
$(BUILT_SOURCES) $(BUILT_SOURCES)
lib_LTLIBRARIES = libweston.la lib_LTLIBRARIES = libweston-@LIBWESTON_MAJOR@.la
libweston_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON libweston_@LIBWESTON_MAJOR@_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON
libweston_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) libweston_@LIBWESTON_MAJOR@_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
libweston_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ libweston_@LIBWESTON_MAJOR@_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
$(DLOPEN_LIBS) -lm $(CLOCK_GETTIME_LIBS) \ $(DLOPEN_LIBS) -lm $(CLOCK_GETTIME_LIBS) \
$(LIBINPUT_BACKEND_LIBS) libshared.la $(LIBINPUT_BACKEND_LIBS) libshared.la
libweston_la_LDFLAGS = -release ${LIBWESTON_ABI_VERSION} libweston_@LIBWESTON_MAJOR@_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
libweston_la_SOURCES = \ libweston_@LIBWESTON_MAJOR@_la_SOURCES = \
libweston/git-version.h \ libweston/git-version.h \
libweston/log.c \ libweston/log.c \
libweston/compositor.c \ libweston/compositor.c \
@@ -121,7 +121,7 @@ systemd_notify_la_SOURCES = \
libweston/compositor.h libweston/compositor.h
endif endif
nodist_libweston_la_SOURCES = \ nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES = \
protocol/weston-screenshooter-protocol.c \ protocol/weston-screenshooter-protocol.c \
protocol/weston-screenshooter-server-protocol.h \ protocol/weston-screenshooter-server-protocol.h \
protocol/text-cursor-position-protocol.c \ protocol/text-cursor-position-protocol.c \
@@ -141,7 +141,7 @@ nodist_libweston_la_SOURCES = \
protocol/pointer-constraints-unstable-v1-protocol.c \ protocol/pointer-constraints-unstable-v1-protocol.c \
protocol/pointer-constraints-unstable-v1-server-protocol.h protocol/pointer-constraints-unstable-v1-server-protocol.h
BUILT_SOURCES += $(nodist_libweston_la_SOURCES) BUILT_SOURCES += $(nodist_libweston_@LIBWESTON_MAJOR@_la_SOURCES)
bin_PROGRAMS += weston bin_PROGRAMS += weston
@@ -152,7 +152,7 @@ weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON \
weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
$(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \ $(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \
-lm libshared.la libweston.la -lm libshared.la libweston-@LIBWESTON_MAJOR@.la
weston_SOURCES = \ weston_SOURCES = \
compositor/main.c \ compositor/main.c \
@@ -229,12 +229,12 @@ endif
endif # BUILD_WESTON_LAUNCH endif # BUILD_WESTON_LAUNCH
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = compositor/weston.pc libweston/libweston-${LIBWESTON_ABI_VERSION}.pc pkgconfig_DATA = compositor/weston.pc libweston/libweston-${LIBWESTON_MAJOR}.pc
wayland_sessiondir = $(datadir)/wayland-sessions wayland_sessiondir = $(datadir)/wayland-sessions
dist_wayland_session_DATA = compositor/weston.desktop dist_wayland_session_DATA = compositor/weston.desktop
libwestonincludedir = $(includedir)/libweston-${LIBWESTON_ABI_VERSION} libwestonincludedir = $(includedir)/libweston-${LIBWESTON_MAJOR}
libwestoninclude_HEADERS = \ libwestoninclude_HEADERS = \
libweston/version.h \ libweston/version.h \
libweston/compositor.h \ libweston/compositor.h \
compositor/weston.pc.in
+1 -1
View File
@@ -8,5 +8,5 @@ pkglibexecdir=${libexecdir}/@PACKAGE@
Name: Weston Plugin API Name: Weston Plugin API
Description: Header files for Weston plugin development Description: Header files for Weston plugin development
Version: @WESTON_VERSION@ Version: @WESTON_VERSION@
Requires.private: libweston-@LIBWESTON_ABI_VERSION@ Requires.private: libweston-@LIBWESTON_MAJOR@
Cflags: -I${includedir}/weston Cflags: -I${includedir}/weston
configure.ac
+11 -3
View File
@@ -3,7 +3,9 @@ m4_define([weston_minor_version], [11])
m4_define([weston_micro_version], [90]) m4_define([weston_micro_version], [90])
m4_define([weston_version], m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version]) [weston_major_version.weston_minor_version.weston_micro_version])
m4_define([libweston_abi_version], [0]) m4_define([libweston_major_version], [0])
m4_define([libweston_minor_version], [0])
m4_define([libweston_patch_version], [0])
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_INIT([weston], AC_INIT([weston],
@@ -18,7 +20,13 @@ AC_SUBST([WESTON_VERSION_MAJOR], [weston_major_version])
AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version]) AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version])
AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version]) AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version])
AC_SUBST([WESTON_VERSION], [weston_version]) AC_SUBST([WESTON_VERSION], [weston_version])
AC_SUBST([LIBWESTON_ABI_VERSION], [libweston_abi_version]) AC_SUBST([LIBWESTON_MAJOR], [libweston_major_version])
# We use minor as current and age since on ABI/API break/removal we bump major
# so minor will be reset to 0.
m4_define([lt_current], [libweston_minor_version])
m4_define([lt_revision], [libweston_patch_version])
m4_define([lt_age], [libweston_minor_version])
AC_SUBST([LT_VERSION_INFO], [lt_current:lt_revision:lt_age])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@@ -637,7 +645,7 @@ AC_CONFIG_FILES([Makefile libweston/version.h compositor/weston.pc])
# AC_CONFIG_FILES needs the full name when running autoconf, so we need to use # AC_CONFIG_FILES needs the full name when running autoconf, so we need to use
# libweston_abi_version here, and outside [] because of m4 quoting rules # libweston_abi_version here, and outside [] because of m4 quoting rules
AC_CONFIG_FILES([libweston/libweston-]libweston_abi_version[.pc:libweston/libweston.pc.in]) AC_CONFIG_FILES([libweston/libweston-]libweston_major_version[.pc:libweston/libweston.pc.in])
AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD]) AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])