From 23ae63e6464f33461cd316d029873f2c33046f83 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Tue, 21 Jul 2020 15:45:57 +0200
Subject: pkg-config: Use "Requires" for external libs such as talloc.

According to https://people.freedesktop.org/~dbn/pkg-config-guide.html
we should use Requires or even Requires.private, not Libs for external
dependencies.

Change-Id: I2aa716125880b444e091812ab800b29a7b905b4f
---
 libosmocodec.pc.in  | 6 +++---
 libosmocoding.pc.in | 6 +++---
 libosmocore.pc.in   | 5 +++--
 libosmoctrl.pc.in   | 4 ++--
 libosmogb.pc.in     | 4 ++--
 libosmogsm.pc.in    | 4 ++--
 libosmosim.pc.in    | 4 ++--
 libosmousb.pc.in    | 4 ++--
 8 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in
index 9e058ef7..a6a9d78b 100644
--- a/libosmocodec.pc.in
+++ b/libosmocodec.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom Codec related utilities Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec
-Cflags: -I${includedir}/ @TALLOC_CFLAGS@
-
+Requires: talloc
+Libs: -L${libdir} -losmocodec
+Cflags: -I${includedir}/
diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in
index d1d03c42..826a3f7d 100644
--- a/libosmocoding.pc.in
+++ b/libosmocoding.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom L1 transcoding Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore
-Cflags: -I${includedir}/ @TALLOC_CFLAGS@
-
+Requires: talloc libosmocodec libosmocgsm libosmocore
+Libs: -L${libdir} -losmocoding
+Cflags: -I${includedir}/
diff --git a/libosmocore.pc.in b/libosmocore.pc.in
index 80f17c8b..925265d0 100644
--- a/libosmocore.pc.in
+++ b/libosmocore.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
 Name: Osmocom Core Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmocore
+Requires: talloc
+Libs: -L${libdir} -losmocore
 Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@
-Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@
+Cflags: -I${includedir}/ @PTHREAD_CFLAGS@
diff --git a/libosmoctrl.pc.in b/libosmoctrl.pc.in
index 4676b31d..c110d8ed 100644
--- a/libosmoctrl.pc.in
+++ b/libosmoctrl.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom Control Interface Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmoctrl -losmogsm -losmocore
+Requires: talloc libosmogsm libosmocore
+Libs: -L${libdir} -losmoctrl
 Cflags: -I${includedir}/
-
diff --git a/libosmogb.pc.in b/libosmogb.pc.in
index a163cc42..769fea4d 100644
--- a/libosmogb.pc.in
+++ b/libosmogb.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom GPRS Gb Library
 Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmogb -losmovty -losmocore
+Requires: talloc libosmovty libosmocore
+Libs: -L${libdir} -losmogb
 Cflags: -I${includedir}/ -fno-strict-aliasing
-
diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in
index 0160be8d..956897bb 100644
--- a/libosmogsm.pc.in
+++ b/libosmogsm.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom GSM Core Library
 Description: GSM Core Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmogsm -losmocore
+Requires: talloc libosmocore
+Libs: -L${libdir} -losmogsm
 Cflags: -I${includedir}/
-
diff --git a/libosmosim.pc.in b/libosmosim.pc.in
index 83777c31..fbcdbe42 100644
--- a/libosmosim.pc.in
+++ b/libosmosim.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom SIM card related utilities Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmosim -losmocore
+Requires: talloc libosmocore
+Libs: -L${libdir} -losmosim
 Cflags: -I${includedir}/
-
diff --git a/libosmousb.pc.in b/libosmousb.pc.in
index ce6d2715..40270744 100644
--- a/libosmousb.pc.in
+++ b/libosmousb.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom libusb (USB) integration
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmousb -losmocore
+Requires: talloc libosmocore
+Libs: -L${libdir} -losmousb
 Cflags: -I${includedir}/
-
-- 
cgit v1.2.3