From 96cf00b7291f8dcf3a09dd427d3933a4865de546 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sat, 13 Jun 2020 03:44:32 +0200 Subject: Add API version to library and pkgconfig file for proper linking --- src/Makefile.am | 12 ++++++------ src/libusbmuxd-2.0.pc.in | 2 +- tools/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 90057aa..227a5c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,14 +3,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common AM_CFLAGS = $(GLOBAL_CFLAGS) $(libplist_CFLAGS) AM_LDFLAGS = $(GLOBAL_LIBS) $(libplist_LIBS) -lib_LTLIBRARIES = libusbmuxd.la -libusbmuxd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBUSBMUXD_SO_VERSION) -no-undefined -libusbmuxd_la_LIBADD = $(top_builddir)/common/libinternalcommon.la -libusbmuxd_la_SOURCES = libusbmuxd.c +lib_LTLIBRARIES = libusbmuxd-2.0.la +libusbmuxd_2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBUSBMUXD_SO_VERSION) -no-undefined +libusbmuxd_2_0_la_LIBADD = $(top_builddir)/common/libinternalcommon.la +libusbmuxd_2_0_la_SOURCES = libusbmuxd.c if WIN32 -libusbmuxd_la_LDFLAGS += -avoid-version -static-libgcc -libusbmuxd_la_LIBADD += -lws2_32 +libusbmuxd_2_0_la_LDFLAGS += -avoid-version -static-libgcc +libusbmuxd_2_0_la_LIBADD += -lws2_32 endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/libusbmuxd-2.0.pc.in b/src/libusbmuxd-2.0.pc.in index c9ca6e2..c489ac1 100644 --- a/src/libusbmuxd-2.0.pc.in +++ b/src/libusbmuxd-2.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: A library to communicate with the usbmux daemon Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lusbmuxd +Libs: -L${libdir} -lusbmuxd-2.0 Cflags: -I${includedir} Requires.private: libplist-2.0 >= @LIBPLIST_VERSION@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 1b8c425..1afaf82 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,10 +6,10 @@ bin_PROGRAMS = iproxy inetcat iproxy_SOURCES = iproxy.c iproxy_CFLAGS = $(AM_CFLAGS) iproxy_LDFLAGS = $(AM_LDFLAGS) -iproxy_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la +iproxy_LDADD = $(top_builddir)/src/libusbmuxd-2.0.la $(top_builddir)/common/libinternalcommon.la inetcat_SOURCES = inetcat.c inetcat_CFLAGS = $(AM_CFLAGS) inetcat_LDFLAGS = $(AM_LDFLAGS) -inetcat_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la +inetcat_LDADD = $(top_builddir)/src/libusbmuxd-2.0.la $(top_builddir)/common/libinternalcommon.la -- cgit v1.1-32-gdbae