From eff97404bd3ca5954a100a68705474956f1a89dc Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Sat, 13 Jun 2020 03:30:05 +0200
Subject: Add API version to library and pkgconfig file for proper linking

---
 src/Makefile.am          | 20 ++++++++++----------
 src/libplist++-2.0.pc.in |  2 +-
 src/libplist-2.0.pc.in   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 02b0478..6583add 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,12 @@ AM_CFLAGS = $(GLOBAL_CFLAGS)
 AM_LDFLAGS = $(GLOBAL_LDFLAGS)
 
 lib_LTLIBRARIES = \
-	libplist.la \
-	libplist++.la
+	libplist-2.0.la \
+	libplist++-2.0.la
 
-libplist_la_LIBADD = $(top_builddir)/libcnary/libcnary.la
-libplist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
-libplist_la_SOURCES = \
+libplist_2_0_la_LIBADD = $(top_builddir)/libcnary/libcnary.la
+libplist_2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
+libplist_2_0_la_SOURCES = \
 	base64.c base64.h \
 	bytearray.c bytearray.h \
 	strbuf.h \
@@ -24,9 +24,9 @@ libplist_la_SOURCES = \
 	bplist.c \
 	plist.c plist.h
 
-libplist___la_LIBADD = libplist.la
-libplist___la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
-libplist___la_SOURCES = \
+libplist___2_0_la_LIBADD = libplist-2.0.la
+libplist___2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
+libplist___2_0_la_SOURCES = \
 	Node.cpp \
 	Structure.cpp \
 	Array.cpp \
@@ -53,8 +53,8 @@ libplist___la_SOURCES = \
 	$(top_srcdir)/include/plist/Uid.h
 
 if WIN32
-libplist_la_LDFLAGS += -avoid-version -static-libgcc
-libplist___la_LDFLAGS += -avoid-version -static-libgcc
+libplist_2_0_la_LDFLAGS += -avoid-version -static-libgcc
+libplist___2_0_la_LDFLAGS += -avoid-version -static-libgcc
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/libplist++-2.0.pc.in b/src/libplist++-2.0.pc.in
index 05b6bb4..79dc315 100644
--- a/src/libplist++-2.0.pc.in
+++ b/src/libplist++-2.0.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@++
 Description: C++ binding for @PACKAGE_NAME@
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lplist++
+Libs: -L${libdir} -lplist++-2.0
 Cflags: -I${includedir}
 Requires.private: libplist-2.0 >= @PACKAGE_VERSION@
diff --git a/src/libplist-2.0.pc.in b/src/libplist-2.0.pc.in
index 0bd6932..43d9f57 100644
--- a/src/libplist-2.0.pc.in
+++ b/src/libplist-2.0.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: A library to handle Apple Property Lists whereas they are binary or XML
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lplist
+Libs: -L${libdir} -lplist-2.0
 Cflags: -I${includedir}
-- 
cgit v1.1-32-gdbae