From: Øyvind Kolås <pippin@gimp.org>
Date: Tue, 6 Aug 2019 12:35:01 +0000 (+0200)
Subject: meson: move pkgconfig after subdir defining babl
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~11^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f43a06f2b7d7f070b02ec72de7c146e30d0b2cfc;p=babl.git

meson: move pkgconfig after subdir defining babl

Use the meson pkgconfig generator after the babl library object has
been defined.
---

diff --git a/meson.build b/meson.build
index fe1cc3b..c971e7c 100644
--- a/meson.build
+++ b/meson.build
@@ -358,21 +358,6 @@ configure_file(
   configuration: conf
 )
 
-# pkg-config file
-pkgconfig.generate(filebase: 'babl',
-  name: 'babl',
-  description: 'Dynamic, any to any, pixel format conversion library',
-  version: meson.project_version(),
-  libraries: [
-    '-l' + lib_name,
-  ],
-  libraries_private: [
-    '-lm', '-lpthread',
-  ],
-  subdirs: [
-    lib_name,
-  ],
-)
 
 ################################################################################
 # Subdirs
@@ -400,3 +385,18 @@ if w3m_bin.found() and build_docs
     capture: true,
   )
 endif
+
+
+# pkg-config file
+pkgconfig.generate(filebase: 'babl',
+  name: 'babl',
+  description: 'Dynamic, any to any, pixel format conversion library',
+  version: meson.project_version(),
+  libraries: [ babl ],
+  libraries_private: [
+    '-lm',
+  ],
+  subdirs: [
+    lib_name,
+  ],
+)