Skip to content

Commit

Permalink
make: drop libtool versioning
Browse files Browse the repository at this point in the history
Multiple instances of libubx are not handled by the scripting layer
either. If really needed, it can be added later.

Signed-off-by: Markus Klotzbuecher <mk@mkio.de>
  • Loading branch information
kmarkus committed May 11, 2020
1 parent 6913052 commit ff78f64
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 15 deletions.
9 changes: 1 addition & 8 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
m4_define([package_version_major],[0])
m4_define([package_version_minor],[8])
m4_define([package_version_micro],[0])

m4_define([libubx_if_current], [9]) dnl inc if IF added, removed or changed
m4_define([libubx_if_revision], [0]) dnl always inc if src changed, zero if current is inc'ed
m4_define([libubx_if_age], [0]) dnl inc if API changes are backwards compatible, zero otherwise
m4_define([package_version_micro],[1])

AC_INIT([ubx], [package_version_major.package_version_minor.package_version_micro])
AM_INIT_AUTOMAKE([foreign -Wall])
Expand All @@ -26,11 +22,8 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT(disable-static)

AC_SUBST([UBX_VER], [package_version_major.package_version_minor])
AC_SUBST([UBX_LT_VER], [libubx_if_current:libubx_if_revision:libubx_if_age])
AC_SUBST([UBX_MODDIR], [$libdir/$PACKAGE/$UBX_VER])
AC_SUBST([UBX_CFLAGS], ["-Wall -Wextra -Werror"])
AC_SUBST([UBX_IF_CURRENT], [libubx_if_current])
AC_SUBST([UBX_IF_AGE], [libubx_if_age])

AC_ARG_ENABLE([timesrc-tsc],
AS_HELP_STRING([--enable-timesrc-tsc], [use TSC as timesource instead of POSIX time]),
Expand Down
2 changes: 1 addition & 1 deletion libubx/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pkginclude_HEADERS = ubx.h \
libubx_la_SOURCES = $(libubx_includes) \
md5.c ubx.c ubx_time.c ubx_utils.c trig_utils.c rtlog.c accessors.c

libubx_la_LDFLAGS = -version-info $(UBX_LT_VER) -lrt -lpthread -ldl
libubx_la_LDFLAGS = -lrt -lpthread -ldl

librtlog_client_la_SOURCES = rtlog_client.c
librtlog_client_la_LDFLAGS = -shared -lrt
Expand Down
5 changes: 0 additions & 5 deletions lua/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,3 @@ luajitmod_SCRIPTS = ubx.lua \
reflect.lua \
blockdiagram.lua \
umf.lua

UBX_IF = $(shell expr $(UBX_IF_CURRENT) - $(UBX_IF_AGE))

ubx.lua: ubx.lua.source
cat $(srcdir)/ubx.lua.source | sed -e "s/UBX_IF/$(UBX_IF)/g" > ubx.lua
2 changes: 1 addition & 1 deletion lua/ubx.lua.source → lua/ubx.lua
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ local ubx_ffi_headers = {
"include/ubx/ubx_proto.h",
}

local ubx_ffi_lib = "lib/libubx.so.UBX_IF"
local ubx_ffi_lib = "lib/libubx.so"

local ubx = nil
local prefixes = { "/usr", "/usr/local" }
Expand Down

0 comments on commit ff78f64

Please sign in to comment.