diff options
| -rw-r--r-- | cython/Makefile.am | 2 | ||||
| -rw-r--r-- | fuzz/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 20 | ||||
| -rw-r--r-- | src/libplist++-2.0.pc.in | 2 | ||||
| -rw-r--r-- | src/libplist-2.0.pc.in | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/cython/Makefile.am b/cython/Makefile.am index 3c70dc9..b4bc662 100644 --- a/cython/Makefile.am +++ b/cython/Makefile.am @@ -40,7 +40,7 @@ plist_la_CFLAGS = \ -fvisibility=default 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) diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am index a8ef294..8fb7cc8 100644 --- a/fuzz/Makefile.am +++ b/fuzz/Makefile.am @@ -25,11 +25,11 @@ noinst_PROGRAMS = \ xplist_fuzzer_SOURCES = xplist_fuzzer.cc 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_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 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} diff --git a/test/Makefile.am b/test/Makefile.am index 2f5e1b9..6b3b901 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -11,11 +11,11 @@ noinst_PROGRAMS = \ plist_cmp_SOURCES = plist_cmp.c plist_cmp_LDADD = \ - $(top_builddir)/src/libplist.la \ + $(top_builddir)/src/libplist-2.0.la \ $(top_builddir)/libcnary/libcnary.la 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 = \ empty.test \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 3b4e06c..9f3214d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,4 +7,4 @@ AM_LDFLAGS = bin_PROGRAMS = plistutil plistutil_SOURCES = plistutil.c -plistutil_LDADD = $(top_builddir)/src/libplist.la +plistutil_LDADD = $(top_builddir)/src/libplist-2.0.la |