aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2022-03-14 11:28:14 +0100
committerHarald Welte <laforge@osmocom.org>2022-03-14 12:45:51 +0100
commite0832603b1b28a5d234ccd0766d0adb4f3628ab4 (patch)
tree4c5bb38ff4046bb9e4fa5b837782dd6b6a1c5979
parent381dc6109950e28492c68834502c85f43f4f2bcc (diff)
clean-up pkg-config files: Make use of "Requires" as documentedlaforge/pkgconfig
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
-rw-r--r--libosmocodec.pc.in6
-rw-r--r--libosmocoding.pc.in6
-rw-r--r--libosmocore.pc.in7
-rw-r--r--libosmoctrl.pc.in4
-rw-r--r--libosmogb.pc.in4
-rw-r--r--libosmogsm.pc.in4
-rw-r--r--libosmosim.pc.in4
-rw-r--r--libosmousb.pc.in4
-rw-r--r--libosmovty.pc.in4
9 files changed, 22 insertions, 21 deletions
diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in
index 9e058ef7..0c4de8d5 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 d1d03c42..5b91a606 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 80f17c8b..3bb9b9ad 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 4676b31d..e9947dce 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 a163cc42..d545ce2d 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 0160be8d..0aaf51ed 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..a8f50d6f 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..dbedb0e5 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 6204e455..9a907e04 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}/
-