From 12eed19066a11aece6f346b54b85326bc6ba7f0b Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 14 Mar 2022 11:28:14 +0100
Subject: [PATCH] clean-up pkg-config files: Make use of "Requires" as
 documented

According to the pkg-config manual, "Libs" should not contain flags
for _required_ packages.  Instead, they should be expressed via
"Requires".  Let's do that

Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b
---
 libosmocodec.pc.in  | 6 +++---
 libosmocoding.pc.in | 6 +++---
 libosmocore.pc.in   | 7 ++++---
 libosmoctrl.pc.in   | 4 ++--
 libosmogb.pc.in     | 4 ++--
 libosmogsm.pc.in    | 4 ++--
 libosmosim.pc.in    | 4 ++--
 libosmousb.pc.in    | 4 ++--
 libosmovty.pc.in    | 4 ++--
 9 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in
index 9e058ef7e..0c4de8d51 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, libosmocore
+Libs: -L${libdir} -losmocodec
+Cflags: -I${includedir}/
diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in
index d1d03c42c..5b91a606e 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, libosmocore, libosmogsm, libosmocodec
+Libs: -L${libdir} -losmocoding
+Cflags: -I${includedir}/
diff --git a/libosmocore.pc.in b/libosmocore.pc.in
index 80f17c8bd..3bb9b9ada 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
-Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@
-Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@
+Requires: talloc, libsctp
+Libs: -L${libdir} -losmocore
+Libs.private: @PTHREAD_LIBS@
+Cflags: -I${includedir}/ @PTHREAD_CFLAGS@
diff --git a/libosmoctrl.pc.in b/libosmoctrl.pc.in
index 4676b31d5..e9947dce6 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, libosmocore, libosmogsm
+Libs: -L${libdir} -losmoctrl
 Cflags: -I${includedir}/
-
diff --git a/libosmogb.pc.in b/libosmogb.pc.in
index a163cc42f..d545ce2d7 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: libosmocore, libosmovty
+Libs: -L${libdir} -losmogb
 Cflags: -I${includedir}/ -fno-strict-aliasing
-
diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in
index 0160be8df..0aaf51ed6 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 83777c31d..a8f50d6f4 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 ce6d27154..dbedb0e51 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, libusb-1.0, libosmocore
+Libs: -L${libdir} -losmousb
 Cflags: -I${includedir}/
-
diff --git a/libosmovty.pc.in b/libosmovty.pc.in
index 6204e455f..9a907e04e 100644
--- a/libosmovty.pc.in
+++ b/libosmovty.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Osmocom VTY Interface Library
 Description: C Utility Library
 Version: @VERSION@
-Libs: -L${libdir} @TALLOC_LIBS@ -losmovty -losmocore
+Requires: libosmocore
+Libs: -L${libdir} -losmovty
 Cflags: -I${includedir}/
-