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 = \ | |||
| 40 | -fvisibility=default | 40 | -fvisibility=default |
| 41 | 41 | ||
| 42 | plist_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) | 42 | plist_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) |
| 43 | plist_la_LIBADD = $(top_builddir)/src/libplist.la | 43 | plist_la_LIBADD = $(top_builddir)/src/libplist-2.0.la |
| 44 | 44 | ||
| 45 | plist.c: plist.pyx $(PXDINCLUDES) $(PXIINCLUDES) | 45 | plist.c: plist.pyx $(PXDINCLUDES) $(PXIINCLUDES) |
| 46 | 46 | ||
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 = \ | |||
| 25 | 25 | ||
| 26 | xplist_fuzzer_SOURCES = xplist_fuzzer.cc | 26 | xplist_fuzzer_SOURCES = xplist_fuzzer.cc |
| 27 | xplist_fuzzer_LDFLAGS = -static | 27 | xplist_fuzzer_LDFLAGS = -static |
| 28 | xplist_fuzzer_LDADD = $(top_builddir)/src/libplist.la libFuzzer.a | 28 | xplist_fuzzer_LDADD = $(top_builddir)/src/libplist-2.0.la libFuzzer.a |
| 29 | 29 | ||
| 30 | bplist_fuzzer_SOURCES = bplist_fuzzer.cc | 30 | bplist_fuzzer_SOURCES = bplist_fuzzer.cc |
| 31 | bplist_fuzzer_LDFLAGS = -static | 31 | bplist_fuzzer_LDFLAGS = -static |
| 32 | bplist_fuzzer_LDADD = $(top_builddir)/src/libplist.la libFuzzer.a | 32 | bplist_fuzzer_LDADD = $(top_builddir)/src/libplist-2.0.la libFuzzer.a |
| 33 | 33 | ||
| 34 | TESTS = fuzzers.test | 34 | TESTS = fuzzers.test |
| 35 | 35 | ||
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) | |||
| 7 | AM_LDFLAGS = $(GLOBAL_LDFLAGS) | 7 | AM_LDFLAGS = $(GLOBAL_LDFLAGS) |
| 8 | 8 | ||
| 9 | lib_LTLIBRARIES = \ | 9 | lib_LTLIBRARIES = \ |
| 10 | libplist.la \ | 10 | libplist-2.0.la \ |
| 11 | libplist++.la | 11 | libplist++-2.0.la |
| 12 | 12 | ||
| 13 | libplist_la_LIBADD = $(top_builddir)/libcnary/libcnary.la | 13 | libplist_2_0_la_LIBADD = $(top_builddir)/libcnary/libcnary.la |
| 14 | libplist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined | 14 | libplist_2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined |
| 15 | libplist_la_SOURCES = \ | 15 | libplist_2_0_la_SOURCES = \ |
| 16 | base64.c base64.h \ | 16 | base64.c base64.h \ |
| 17 | bytearray.c bytearray.h \ | 17 | bytearray.c bytearray.h \ |
| 18 | strbuf.h \ | 18 | strbuf.h \ |
| @@ -24,9 +24,9 @@ libplist_la_SOURCES = \ | |||
| 24 | bplist.c \ | 24 | bplist.c \ |
| 25 | plist.c plist.h | 25 | plist.c plist.h |
| 26 | 26 | ||
| 27 | libplist___la_LIBADD = libplist.la | 27 | libplist___2_0_la_LIBADD = libplist-2.0.la |
| 28 | libplist___la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined | 28 | libplist___2_0_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBPLIST_SO_VERSION) -no-undefined |
| 29 | libplist___la_SOURCES = \ | 29 | libplist___2_0_la_SOURCES = \ |
| 30 | Node.cpp \ | 30 | Node.cpp \ |
| 31 | Structure.cpp \ | 31 | Structure.cpp \ |
| 32 | Array.cpp \ | 32 | Array.cpp \ |
| @@ -53,8 +53,8 @@ libplist___la_SOURCES = \ | |||
| 53 | $(top_srcdir)/include/plist/Uid.h | 53 | $(top_srcdir)/include/plist/Uid.h |
| 54 | 54 | ||
| 55 | if WIN32 | 55 | if WIN32 |
| 56 | libplist_la_LDFLAGS += -avoid-version -static-libgcc | 56 | libplist_2_0_la_LDFLAGS += -avoid-version -static-libgcc |
| 57 | libplist___la_LDFLAGS += -avoid-version -static-libgcc | 57 | libplist___2_0_la_LDFLAGS += -avoid-version -static-libgcc |
| 58 | endif | 58 | endif |
| 59 | 59 | ||
| 60 | pkgconfigdir = $(libdir)/pkgconfig | 60 | 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@ | |||
| 6 | Name: @PACKAGE_NAME@++ | 6 | Name: @PACKAGE_NAME@++ |
| 7 | Description: C++ binding for @PACKAGE_NAME@ | 7 | Description: C++ binding for @PACKAGE_NAME@ |
| 8 | Version: @PACKAGE_VERSION@ | 8 | Version: @PACKAGE_VERSION@ |
| 9 | Libs: -L${libdir} -lplist++ | 9 | Libs: -L${libdir} -lplist++-2.0 |
| 10 | Cflags: -I${includedir} | 10 | Cflags: -I${includedir} |
| 11 | Requires.private: libplist-2.0 >= @PACKAGE_VERSION@ | 11 | 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@ | |||
| 6 | Name: @PACKAGE_NAME@ | 6 | Name: @PACKAGE_NAME@ |
| 7 | Description: A library to handle Apple Property Lists whereas they are binary or XML | 7 | Description: A library to handle Apple Property Lists whereas they are binary or XML |
| 8 | Version: @PACKAGE_VERSION@ | 8 | Version: @PACKAGE_VERSION@ |
| 9 | Libs: -L${libdir} -lplist | 9 | Libs: -L${libdir} -lplist-2.0 |
| 10 | Cflags: -I${includedir} | 10 | 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 = \ | |||
| 11 | 11 | ||
| 12 | plist_cmp_SOURCES = plist_cmp.c | 12 | plist_cmp_SOURCES = plist_cmp.c |
| 13 | plist_cmp_LDADD = \ | 13 | plist_cmp_LDADD = \ |
| 14 | $(top_builddir)/src/libplist.la \ | 14 | $(top_builddir)/src/libplist-2.0.la \ |
| 15 | $(top_builddir)/libcnary/libcnary.la | 15 | $(top_builddir)/libcnary/libcnary.la |
| 16 | 16 | ||
| 17 | plist_test_SOURCES = plist_test.c | 17 | plist_test_SOURCES = plist_test.c |
| 18 | plist_test_LDADD = $(top_builddir)/src/libplist.la | 18 | plist_test_LDADD = $(top_builddir)/src/libplist-2.0.la |
| 19 | 19 | ||
| 20 | TESTS = \ | 20 | TESTS = \ |
| 21 | empty.test \ | 21 | 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 = | |||
| 7 | bin_PROGRAMS = plistutil | 7 | bin_PROGRAMS = plistutil |
| 8 | 8 | ||
| 9 | plistutil_SOURCES = plistutil.c | 9 | plistutil_SOURCES = plistutil.c |
| 10 | plistutil_LDADD = $(top_builddir)/src/libplist.la | 10 | plistutil_LDADD = $(top_builddir)/src/libplist-2.0.la |
