diff options
author | iphydf <iphydf@users.noreply.github.com> | 2017-01-15 16:16:16 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2017-12-28 23:01:41 +0000 |
commit | f2b6090eca42f4a364ef7517c5eec6d472e9b5f6 (patch) | |
tree | 3e83bf92287d822fef55f44e2ed3b9e1157c061e /other/pkgconfig | |
parent | 83377e6865dcf8aaf3652fde3d70d73c2a48b2cb (diff) |
Generate only one large library "libtoxcore".
This library contains all the code for the old libtoxcore, libtoxav,
libtoxdns, and libtoxencryptsave. The build for toxav is still optional,
and disabling it causes libtoxcore to simply not contain those symbols
and the pkg-config file to not include opus and vpx as dependencies.
Diffstat (limited to 'other/pkgconfig')
-rw-r--r-- | other/pkgconfig/libtoxav.pc.in | 8 | ||||
-rw-r--r-- | other/pkgconfig/libtoxcore.pc.in | 8 | ||||
-rw-r--r-- | other/pkgconfig/toxav.pc.in | 10 | ||||
-rw-r--r-- | other/pkgconfig/toxcore.pc.in | 4 | ||||
-rw-r--r-- | other/pkgconfig/toxdns.pc.in | 10 | ||||
-rw-r--r-- | other/pkgconfig/toxencryptsave.pc.in | 10 |
6 files changed, 2 insertions, 48 deletions
diff --git a/other/pkgconfig/libtoxav.pc.in b/other/pkgconfig/libtoxav.pc.in deleted file mode 100644 index e0b95b48..00000000 --- a/other/pkgconfig/libtoxav.pc.in +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: libtoxav | ||
6 | Description: Tox A/V library - compatibility module (use toxav instead) | ||
7 | Requires: toxav | ||
8 | Version: @PROJECT_VERSION@ | ||
diff --git a/other/pkgconfig/libtoxcore.pc.in b/other/pkgconfig/libtoxcore.pc.in deleted file mode 100644 index c5588bb4..00000000 --- a/other/pkgconfig/libtoxcore.pc.in +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: libtoxcore | ||
6 | Description: Tox protocol library - compatibility module (use toxcore, toxdns, and toxencryptsave instead) | ||
7 | Requires: toxcore toxdns toxencryptsave | ||
8 | Version: @PROJECT_VERSION@ | ||
diff --git a/other/pkgconfig/toxav.pc.in b/other/pkgconfig/toxav.pc.in deleted file mode 100644 index 6b56500b..00000000 --- a/other/pkgconfig/toxav.pc.in +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: toxav | ||
6 | Description: Tox A/V library | ||
7 | Requires: opus toxcore vpx | ||
8 | Version: @PROJECT_VERSION@ | ||
9 | Libs: -L${libdir} @toxav_PKGCONFIG_LIBS@ -ltoxav | ||
10 | Cflags: -I${includedir} | ||
diff --git a/other/pkgconfig/toxcore.pc.in b/other/pkgconfig/toxcore.pc.in index 48acc429..72fe00cf 100644 --- a/other/pkgconfig/toxcore.pc.in +++ b/other/pkgconfig/toxcore.pc.in | |||
@@ -4,7 +4,7 @@ includedir=${prefix}/include | |||
4 | 4 | ||
5 | Name: toxcore | 5 | Name: toxcore |
6 | Description: Tox protocol library | 6 | Description: Tox protocol library |
7 | Requires: libsodium | 7 | Requires: @toxcore_PKGCONFIG_REQUIRES@ |
8 | Version: @PROJECT_VERSION@ | 8 | Version: @PROJECT_VERSION@ |
9 | Libs: -L${libdir} -ltoxcore @toxcore_PKGCONFIG_LIBS@ -ltoxcrypto -ltoxnetwork -ltoxdht -ltoxnetcrypto -ltoxfriends -ltoxmessenger -ltoxgroup | 9 | Libs: -L${libdir} -ltoxcore @toxcore_PKGCONFIG_LIBS@ |
10 | Cflags: -I${includedir} | 10 | Cflags: -I${includedir} |
diff --git a/other/pkgconfig/toxdns.pc.in b/other/pkgconfig/toxdns.pc.in deleted file mode 100644 index 0f69130c..00000000 --- a/other/pkgconfig/toxdns.pc.in +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: toxdns | ||
6 | Description: Tox DNS3 library | ||
7 | Requires: toxcore | ||
8 | Version: @PROJECT_VERSION@ | ||
9 | Libs: -L${libdir} @toxdns_PKGCONFIG_LIBS@ -ltoxdns | ||
10 | Cflags: -I${includedir} | ||
diff --git a/other/pkgconfig/toxencryptsave.pc.in b/other/pkgconfig/toxencryptsave.pc.in deleted file mode 100644 index bd717f53..00000000 --- a/other/pkgconfig/toxencryptsave.pc.in +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
2 | libdir=${prefix}/lib | ||
3 | includedir=${prefix}/include | ||
4 | |||
5 | Name: toxencryptsave | ||
6 | Description: Tox block encryption library | ||
7 | Requires: toxcore | ||
8 | Version: @PROJECT_VERSION@ | ||
9 | Libs: -L${libdir} @toxencryptsave_PKGCONFIG_LIBS@ -ltoxencryptsave | ||
10 | Cflags: -I${includedir} | ||