Commit eff97404 authored by Nikias Bassen's avatar Nikias Bassen Committed by Martin Szulecki

Add API version to library and pkgconfig file for proper linking

parent 4bbbd7f8
...@@ -40,7 +40,7 @@ plist_la_CFLAGS = \ ...@@ -40,7 +40,7 @@ plist_la_CFLAGS = \
-fvisibility=default -fvisibility=default
plist_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) plist_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS)
plist_la_LIBADD = $(top_builddir)/src/libplist.la plist_la_LIBADD = $(top_builddir)/src/libplist-2.0.la
plist.c: plist.pyx $(PXDINCLUDES) $(PXIINCLUDES) plist.c: plist.pyx $(PXDINCLUDES) $(PXIINCLUDES)
......
...@@ -25,11 +25,11 @@ noinst_PROGRAMS = \ ...@@ -25,11 +25,11 @@ noinst_PROGRAMS = \
xplist_fuzzer_SOURCES = xplist_fuzzer.cc xplist_fuzzer_SOURCES = xplist_fuzzer.cc
xplist_fuzzer_LDFLAGS = -static xplist_fuzzer_LDFLAGS = -static
xplist_fuzzer_LDADD = $(top_builddir)/src/libplist.la libFuzzer.a xplist_fuzzer_LDADD = $(top_builddir)/src/libplist-2.0.la libFuzzer.a
bplist_fuzzer_SOURCES = bplist_fuzzer.cc bplist_fuzzer_SOURCES = bplist_fuzzer.cc
bplist_fuzzer_LDFLAGS = -static bplist_fuzzer_LDFLAGS = -static
bplist_fuzzer_LDADD = $(top_builddir)/src/libplist.la libFuzzer.a bplist_fuzzer_LDADD = $(top_builddir)/src/libplist-2.0.la libFuzzer.a
TESTS = fuzzers.test TESTS = fuzzers.test
......
...@@ -7,12 +7,12 @@ AM_CFLAGS = $(GLOBAL_CFLAGS) ...@@ -7,12 +7,12 @@ AM_CFLAGS = $(GLOBAL_CFLAGS)
AM_LDFLAGS = $(GLOBAL_LDFLAGS) AM_LDFLAGS = $(GLOBAL_LDFLAGS)
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libplist.la \ libplist-2.0.la \
libplist++.la libplist++-2.0.la
libplist_la_LIBADD = $(top_builddir)/libcnary/libcnary.la libplist_2_0_la_LIBADD = $(top_builddir)/libcnary/libcnary.la
libplist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined libplist_2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
libplist_la_SOURCES = \ libplist_2_0_la_SOURCES = \
base64.c base64.h \ base64.c base64.h \
bytearray.c bytearray.h \ bytearray.c bytearray.h \
strbuf.h \ strbuf.h \
...@@ -24,9 +24,9 @@ libplist_la_SOURCES = \ ...@@ -24,9 +24,9 @@ libplist_la_SOURCES = \
bplist.c \ bplist.c \
plist.c plist.h plist.c plist.h
libplist___la_LIBADD = libplist.la libplist___2_0_la_LIBADD = libplist-2.0.la
libplist___la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined libplist___2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined
libplist___la_SOURCES = \ libplist___2_0_la_SOURCES = \
Node.cpp \ Node.cpp \
Structure.cpp \ Structure.cpp \
Array.cpp \ Array.cpp \
...@@ -53,8 +53,8 @@ libplist___la_SOURCES = \ ...@@ -53,8 +53,8 @@ libplist___la_SOURCES = \
$(top_srcdir)/include/plist/Uid.h $(top_srcdir)/include/plist/Uid.h
if WIN32 if WIN32
libplist_la_LDFLAGS += -avoid-version -static-libgcc libplist_2_0_la_LDFLAGS += -avoid-version -static-libgcc
libplist___la_LDFLAGS += -avoid-version -static-libgcc libplist___2_0_la_LDFLAGS += -avoid-version -static-libgcc
endif endif
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
......
...@@ -6,6 +6,6 @@ includedir=@includedir@ ...@@ -6,6 +6,6 @@ includedir=@includedir@
Name: @PACKAGE_NAME@++ Name: @PACKAGE_NAME@++
Description: C++ binding for @PACKAGE_NAME@ Description: C++ binding for @PACKAGE_NAME@
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lplist++ Libs: -L${libdir} -lplist++-2.0
Cflags: -I${includedir} Cflags: -I${includedir}
Requires.private: libplist-2.0 >= @PACKAGE_VERSION@ Requires.private: libplist-2.0 >= @PACKAGE_VERSION@
...@@ -6,5 +6,5 @@ includedir=@includedir@ ...@@ -6,5 +6,5 @@ includedir=@includedir@
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Description: A library to handle Apple Property Lists whereas they are binary or XML Description: A library to handle Apple Property Lists whereas they are binary or XML
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lplist Libs: -L${libdir} -lplist-2.0
Cflags: -I${includedir} Cflags: -I${includedir}
...@@ -11,11 +11,11 @@ noinst_PROGRAMS = \ ...@@ -11,11 +11,11 @@ noinst_PROGRAMS = \
plist_cmp_SOURCES = plist_cmp.c plist_cmp_SOURCES = plist_cmp.c
plist_cmp_LDADD = \ plist_cmp_LDADD = \
$(top_builddir)/src/libplist.la \ $(top_builddir)/src/libplist-2.0.la \
$(top_builddir)/libcnary/libcnary.la $(top_builddir)/libcnary/libcnary.la
plist_test_SOURCES = plist_test.c plist_test_SOURCES = plist_test.c
plist_test_LDADD = $(top_builddir)/src/libplist.la plist_test_LDADD = $(top_builddir)/src/libplist-2.0.la
TESTS = \ TESTS = \
empty.test \ empty.test \
......
...@@ -7,4 +7,4 @@ AM_LDFLAGS = ...@@ -7,4 +7,4 @@ AM_LDFLAGS =
bin_PROGRAMS = plistutil bin_PROGRAMS = plistutil
plistutil_SOURCES = plistutil.c plistutil_SOURCES = plistutil.c
plistutil_LDADD = $(top_builddir)/src/libplist.la plistutil_LDADD = $(top_builddir)/src/libplist-2.0.la
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment