Skip to content

Commit

Permalink
Refactor nut_report_config_flags() from many programs into common.c [n…
Browse files Browse the repository at this point in the history
…etworkupstools#1826, networkupstools#1709] - bump libs version-info
  • Loading branch information
jimklimov committed Jan 21, 2023
1 parent 4d64fa0 commit 79628b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions clients/Makefile.am
Expand Up @@ -91,7 +91,7 @@ endif
# object .so names would differ)

# libupsclient version information
libupsclient_la_LDFLAGS = -version-info 6:0:0
libupsclient_la_LDFLAGS = -version-info 6:1:0
libupsclient_la_LDFLAGS += -export-symbols-regex ^upscli_
if HAVE_WINDOWS
# Many versions of MingW seem to fail to build non-static DLL without this
Expand All @@ -101,7 +101,7 @@ endif
if HAVE_CXX11
# libnutclient version information and build
libnutclient_la_SOURCES = nutclient.h nutclient.cpp
libnutclient_la_LDFLAGS = -version-info 2:1:0
libnutclient_la_LDFLAGS = -version-info 2:2:0
# Needed in not-standalone builds with -DHAVE_NUTCOMMON=1
# which is defined for in-tree CXX builds above:
libnutclient_la_LIBADD = $(top_builddir)/common/libcommonclient.la
Expand All @@ -116,7 +116,7 @@ endif
if HAVE_CXX11
# libnutclientstub version information and build
libnutclientstub_la_SOURCES = nutclientmem.h nutclientmem.cpp
libnutclientstub_la_LDFLAGS = -version-info 1:0:0
libnutclientstub_la_LDFLAGS = -version-info 1:1:0
libnutclientstub_la_LIBADD = libnutclient.la
if HAVE_WINDOWS
# Many versions of MingW seem to fail to build non-static DLL without this
Expand Down
4 changes: 2 additions & 2 deletions tools/nut-scanner/Makefile.am
Expand Up @@ -78,7 +78,7 @@ endif
# object .so names would differ)
#
# libnutscan version information
libnutscan_la_LDFLAGS += -version-info 2:0:0
libnutscan_la_LDFLAGS += -version-info 2:1:0

# libnutscan exported symbols regex
# WARNING: Since the library includes parts of libcommon (as much as needed
Expand All @@ -89,7 +89,7 @@ libnutscan_la_LDFLAGS += -version-info 2:0:0
# copies of "nut_debug_level" making fun of our debug-logging attempts.
# One solution to tackle if needed for those cases would be to make some
# dynamic/shared libnutcommon (etc.)
libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebugx|max_threads|curr_threads)'
libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebugx|max_threads|curr_threads|nut_report_config_flags)'
libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include \
$(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers

Expand Down

0 comments on commit 79628b7

Please sign in to comment.